diff options
| -rw-r--r-- | failed.txt | 3 | ||||
| -rw-r--r-- | macros.php | 1 | ||||
| -rw-r--r-- | php.spec | 14 |
3 files changed, 16 insertions, 2 deletions
@@ -7,8 +7,9 @@ $ grep -r 'Tests failed' /var/lib/mock/scl55*/build.log /var/lib/mock/scl55fc21x/build.log:Tests failed : 0 ( 0.0%) ( 0.0%) /var/lib/mock/scl55fc22x/build.log:Tests failed : 0 ( 0.0%) ( 0.0%) /var/lib/mock/scl55fc23x/build.log:Tests failed : 1 ( 0.0%) ( 0.0%) +/var/lib/mock/scl55fc24x/build.log:Tests failed : 1 ( 0.0%) ( 0.0%) -fc23: +fc23, fc24: Bug #64802: openssl_x509_parse fails to parse subject properly in some cases [ext/openssl/tests/bug64802.phpt] * proc_open have erratic results :( @@ -13,3 +13,4 @@ %@SCL@php_incldir @INCDIR@/php %@SCL@__php @BINDIR@/php + @@ -140,7 +140,7 @@ Summary: PHP scripting language for creating dynamic web sites Name: %{?scl_prefix}php Version: 5.5.33 -Release: 1%{?dist} +Release: 2%{?dist} # All files licensed under PHP version 3.01, except # Zend is licensed under Zend # TSRM is licensed under BSD @@ -997,6 +997,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 @@ -1328,6 +1331,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 @@ -1632,6 +1638,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) @@ -1761,6 +1770,9 @@ fi %changelog +* Thu Mar 10 2016 Remi Collet <remi@fedoraproject.org> 5.5.33-2 +- adapt for F24: define %%pecl_xmldir and own it + * Wed Mar 2 2016 Remi Collet <remi@fedoraproject.org> 5.5.33-1 - Update to 5.5.33 http://www.php.net/releases/5_5_33.php |