summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--failed.txt1
-rw-r--r--macros.php1
-rw-r--r--php.spec14
3 files changed, 15 insertions, 1 deletions
diff --git a/failed.txt b/failed.txt
index 8747e5d..a66b835 100644
--- a/failed.txt
+++ b/failed.txt
@@ -8,6 +8,7 @@ $ grep -r 'Tests failed' /var/lib/mock/scl56*/build.log
/var/lib/mock/scl56fc21x/build.log:Tests failed : 0 ( 0.0%) ( 0.0%)
/var/lib/mock/scl56fc22x/build.log:Tests failed : 0 ( 0.0%) ( 0.0%)
/var/lib/mock/scl56fc23x/build.log:Tests failed : 0 ( 0.0%) ( 0.0%)
+/var/lib/mock/scl56fc24x/build.log:Tests failed : 0 ( 0.0%) ( 0.0%)
el6x, el7x, fc19x, fc20x:
Bug #33414 [2] (Comprehensive list of incorrect days returned after strotime() / date() tests) [ext/date/tests/bug33414-2.phpt]
diff --git a/macros.php b/macros.php
index 4673326..3943a74 100644
--- a/macros.php
+++ b/macros.php
@@ -13,3 +13,4 @@
%@SCL@php_incldir @INCDIR@/php
%@SCL@__php @BINDIR@/php
+
diff --git a/php.spec b/php.spec
index 2c3dd36..cb9802b 100644
--- a/php.spec
+++ b/php.spec
@@ -138,7 +138,7 @@
%endif
#global rcver RC1
-%global rpmrel 1
+%global rpmrel 2
Summary: PHP scripting language for creating dynamic web sites
Name: %{?scl_prefix}php
@@ -1017,6 +1017,9 @@ sed -e "s/@PHP_APIVER@/%{apiver}%{isasuffix}/" \
-e "s:@BINDIR@:%{_bindir}:" \
-e "s:@SCL@:%{?scl:%{scl}_}:" \
%{SOURCE3} | tee macros.php
+%if 0%{?fedora} >= 24
+echo '%%%{?scl:%{scl}_}pecl_xmldir %{_localstatedir}/lib/php/peclxml' | tee -a macros.php
+%endif
# php-fpm configuration files for tmpfiles.d
# TODO echo "d /run/php-fpm 755 root root" >php-fpm.tmpfiles
@@ -1344,6 +1347,9 @@ install -m 755 -d $RPM_BUILD_ROOT%{_sysconfdir}/php.d
install -m 755 -d $RPM_BUILD_ROOT%{_localstatedir}/lib/php
install -m 700 -d $RPM_BUILD_ROOT%{_localstatedir}/lib/php/session
install -m 700 -d $RPM_BUILD_ROOT%{_localstatedir}/lib/php/wsdlcache
+%if 0%{?fedora} >= 24
+install -m 755 -d $RPM_BUILD_ROOT%{_localstatedir}/lib/php/peclxml
+%endif
%if %{with_lsws}
install -m 755 build-apache/sapi/litespeed/php $RPM_BUILD_ROOT%{_bindir}/lsphp
@@ -1666,6 +1672,9 @@ fi
%dir %{_libdir}/php/modules
%dir %{_localstatedir}/lib/php
%dir %{_datadir}/php
+%if 0%{?fedora} >= 24
+%dir %{_localstatedir}/lib/php/peclxml
+%endif
%files cli
%defattr(-,root,root)
@@ -1804,6 +1813,9 @@ fi
%changelog
+* Wed Mar 9 2016 Remi Collet <remi@fedoraproject.org> 5.6.19-2
+- adapt for F24: define %%pecl_xmldir and own it
+
* Thu Mar 3 2016 Remi Collet <remi@fedoraproject.org> 5.6.19-1
- Update to 5.6.19
http://www.php.net/releases/5_6_19.php