From f3a7ca1336fea5d61e4d28e56db2ca32cee3b147 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Tue, 15 Aug 2017 11:52:29 +0200
Subject: update to 7.2.0beta3

---
 php.spec | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

(limited to 'php.spec')

diff --git a/php.spec b/php.spec
index 3dc55f6..b442cec 100644
--- a/php.spec
+++ b/php.spec
@@ -133,8 +133,8 @@
 #global gh_date      20170711
 %global gh_owner     php
 %global gh_project   php-src
-%global rcver        beta2
-%global rpmrel       15
+%global rcver        beta3
+%global rpmrel       16
 
 
 Summary: PHP scripting language for creating dynamic web sites
@@ -181,8 +181,6 @@ Patch6: php-5.6.3-embed.patch
 Patch7: php-5.3.0-recode.patch
 Patch8: php-7.1.0-libdb.patch
 Patch9: php-7.0.7-curl.patch
-Patch10: php-sqlite3.patch
-Patch11: php-sqlite3_2.patch
 
 # Functional changes
 Patch40: php-7.1.3-dlopen.patch
@@ -911,11 +909,9 @@ low-level PHP extension for the libsodium cryptographic library.
 %if 0%{?rhel}
 %patch9 -p1 -b .curltls
 %endif
-%patch10 -p1 -b .errstr
-%patch11 -p1 -b .v2
 
 %patch40 -p1 -b .dlopen
-%if 0%{?fedora} >= 24 || 0%{?rhel} >= 5
+%if 0%{?fedora} >= 25 || 0%{?rhel} >= 6
 %patch42 -p1 -b .systzdata
 %endif
 %patch43 -p1 -b .headers
@@ -1151,7 +1147,7 @@ ln -sf ../configure
     --with-layout=GNU \
     --with-kerberos \
     --with-libxml-dir=%{_root_prefix} \
-%if 0%{?fedora} >= 24 || 0%{?rhel} >= 5
+%if 0%{?fedora} >= 25 || 0%{?rhel} >= 6
     --with-system-tzdata \
 %endif
     --with-mhash \
@@ -1445,6 +1441,8 @@ sed -e 's:/run:%{_localstatedir}/run:' \
     -e 's:php-fpm.service:%{?scl_prefix}php-fpm.service:' \
     -e 's:/usr/sbin:%{_sbindir}:' \
     -i $RPM_BUILD_ROOT%{_unitdir}/%{?scl_prefix}php-fpm.service
+sed -e 's/^pid/;pid/' \
+    -i $RPM_BUILD_ROOT%{_sysconfdir}/php-fpm.conf
 # this folder requires systemd >= 204
 install -m 755 -d $RPM_BUILD_ROOT%{_root_sysconfdir}/systemd/system/%{?scl_prefix}php-fpm.service.d
 %else
@@ -1849,6 +1847,9 @@ fi
 
 
 %changelog
+* Tue Aug 15 2017 Remi Collet <remi@remirepo.net> - 7.2.0-0.16.beta3
+- update to 7.2.0beta3
+
 * Tue Aug  1 2017 Remi Collet <remi@remirepo.net> - 7.2.0-0.15.beta2
 - add patch for EL-6, fix undefined symbol: sqlite3_errstr
 - revert use of sqlite3_close_v2 on EL-6
-- 
cgit