From a3d4d25dc496959efb77abab9c68893fbdbc3931 Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Thu, 10 Mar 2016 14:55:50 +0100
Subject: php54-php: F24

---
 php.spec | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

(limited to 'php.spec')

diff --git a/php.spec b/php.spec
index 394cdc7..f0d84ad 100644
--- a/php.spec
+++ b/php.spec
@@ -119,7 +119,7 @@
 Summary: PHP scripting language for creating dynamic web sites
 Name: %{?scl_prefix}php
 Version: 5.4.45
-Release: 5%{?dist}
+Release: 6%{?dist}
 # All files licensed under PHP version 3.01, except
 # Zend is licensed under Zend
 # TSRM is licensed under BSD
@@ -952,6 +952,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
 
 
 %build
@@ -1245,6 +1248,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
@@ -1539,6 +1545,9 @@ EOF
 %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)
@@ -1662,6 +1671,9 @@ EOF
 
 
 %changelog
+* Thu Mar 10 2016 Remi Collet <remi@fedoraproject.org> 5.4.45-6
+- adapt for F24: define %%pecl_xmldir and own it
+
 * Wed Mar  2 2016 Remi Collet <remi@remirepo.net> 5.4.45-5
 - Fix #71498: Out-of-Bound Read in phar_parse_zipfile()
 - Fix #71587: Use-After-Free / Double-Free in WDDX Deserialize
-- 
cgit