From f5a564de293face92608da8c86e7a9087c65c9ab Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Fri, 4 Mar 2016 16:26:09 +0100
Subject: php 7.0.4, rebuild for F24

---
 failed.txt |  6 +++++-
 macros.php |  2 ++
 php70.spec | 14 +++++++++++++-
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/failed.txt b/failed.txt
index 7836dfb..ff52fc8 100644
--- a/failed.txt
+++ b/failed.txt
@@ -11,6 +11,8 @@ $ grep -r 'Tests failed' /var/lib/mock/*/build.log
 /var/lib/mock/fc22x/build.log:Tests failed    :    0 (  0.0%) (  0.0%)
 /var/lib/mock/fc23i/build.log:Tests failed    :    1 (  0.0%) (  0.0%)
 /var/lib/mock/fc23x/build.log:Tests failed    :    0 (  0.0%) (  0.0%)
+/var/lib/mock/fc24i/build.log:Tests failed    :    1 (  0.0%) (  0.0%)
+/var/lib/mock/fc24x/build.log:Tests failed    :    1 (  0.0%) (  0.0%)
 
 
 el6i, el6x, el7x
@@ -21,7 +23,9 @@ fc21x
 	*	php://input is empty when enable_post_data_reading=Off [tests/basic/bug67198.phpt]
 fc22i
 	*	Bug #70198 Checking liveness does not work as expected [ext/standard/tests/streams/bug70198.phpt]
-el6i, fc21i fc22i, fc23i
+fc24x
+	*	Bug #64438 proc_open hangs with stdin/out with 4097+ bytes [ext/standard/tests/streams/proc_open_bug64438.phpt]
+el6i, fc21i fc22i, fc23i, fc24i
 	**	Test str_pad() function : usage variations - unexpected large value for '$pad_length' argument [ext/standard/tests/strings/str_pad_variation5.phpt]
 
 
diff --git a/macros.php b/macros.php
index 784d601..0c750a7 100644
--- a/macros.php
+++ b/macros.php
@@ -17,3 +17,5 @@
 
 %__php         %{_bindir}/php
 %__ztsphp      %{_bindir}/zts-php
+
+
diff --git a/php70.spec b/php70.spec
index 951c43c..2c2219a 100644
--- a/php70.spec
+++ b/php70.spec
@@ -122,7 +122,7 @@
 %endif
 
 #global rcver         RC1
-%global rpmrel        1
+%global rpmrel        2
 
 Summary: PHP scripting language for creating dynamic web sites
 Name: php
@@ -1573,6 +1573,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
@@ -1736,6 +1739,9 @@ sed -e "s/@PHP_APIVER@/%{apiver}%{isasuffix}/" \
     -e "/zts/d" \
 %endif
     < %{SOURCE3} > macros.php
+%if 0%{?fedora} >= 24
+echo '%pecl_xmldir   %{_localstatedir}/lib/php/peclxml' >>macros.php
+%endif
 install -m 644 -D macros.php \
            $RPM_BUILD_ROOT%{macrosdir}/macros.php
 
@@ -1857,6 +1863,9 @@ fi
 %dir %{_libdir}/php-zts/modules
 %endif
 %dir %{_localstatedir}/lib/php
+%if 0%{?fedora} >= 24
+%dir %{_localstatedir}/lib/php/peclxml
+%endif
 %dir %{_datadir}/php
 
 %files cli
@@ -1994,6 +2003,9 @@ fi
 
 
 %changelog
+* Fri Mar  4 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
-- 
cgit