php70-php: prepare for F24

2 files changed, 15 insertions, 1 deletions

diff --git a/macros.php b/macros.php
index 4673326..b837667 100644
--- a/macros.php
+++ b/macros.php
@@ -13,3 +13,5 @@
 %@SCL@php_incldir  @INCDIR@/php
 
 %@SCL@__php        @BINDIR@/php
+
+
diff --git a/php.spec b/php.spec
index 988c261..64d4b44 100644
--- a/php.spec
+++ b/php.spec
@@ -126,7 +126,7 @@
 %endif
 
 #global rcver        RC1
-%global rpmrel       1
+%global rpmrel       2
 
 
 Summary: PHP scripting language for creating dynamic web sites
@@ -1029,6 +1029,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 '%pecl_xmldir   %{_localstatedir}/lib/php/peclxml' >>macros.php
+%endif
 
 # php-fpm configuration files for tmpfiles.d
 # TODO echo "d /run/php-fpm 755 root root" >php-fpm.tmpfiles
@@ -1389,6 +1392,9 @@ 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
 install -m 700 -d $RPM_BUILD_ROOT%{_localstatedir}/lib/php/opcache
+%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
@@ -1689,6 +1695,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)
@@ -1832,6 +1841,9 @@ fi
 
 
 %changelog
+* Sun Mar  6 2016 Remi Collet <remi@fedoraproject.org> 7.0.4-2
+- adapt for F24: define %%pecl_xmldir and own it
+
 * Wed Mar  2 2016 Remi Collet <remi@fedoraproject.org> 7.0.4-1
 - Update to 7.0.4
   http://www.php.net/releases/7_0_4.php