From 745c6576f988ca79bdde8abd2ce44573d61ff222 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Tue, 8 Jan 2019 14:28:27 +0100
Subject: Update to 7.2.14 - http://www.php.net/releases/7_2_14.php

---
 failed.txt |  5 ++++-
 php72.spec | 11 +++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/failed.txt b/failed.txt
index b243013..0abd7ed 100644
--- a/failed.txt
+++ b/failed.txt
@@ -1,10 +1,11 @@
-===== 7.2.14RC1 (2018-12-20)
+===== 7.2.14 (2019-01-10)
 
 $ grep -r 'Tests failed' /var/lib/mock/{fc,el}*/build.log
 
 /var/lib/mock/el6i/build.log:Tests failed    :     0
 /var/lib/mock/el6x/build.log:Tests failed    :     0
 /var/lib/mock/el7x/build.log:Tests failed    :     0
+/var/lib/mock/el8x73/build.logTests failed    :   30
 /var/lib/mock/fc25i/build.log:Tests failed    :    0
 /var/lib/mock/fc25x/build.log:Tests failed    :    0
 /var/lib/mock/fc26i/build.log:Tests failed    :    0
@@ -17,6 +18,8 @@ $ grep -r 'Tests failed' /var/lib/mock/{fc,el}*/build.log
 /var/lib/mock/fc29x/build.log:Tests failed    :    0
 
 
+el8x:
+	openssl failure under investigation
 
 
 1	proc_open give erratic test results :(
diff --git a/php72.spec b/php72.spec
index 465e607..48605cf 100644
--- a/php72.spec
+++ b/php72.spec
@@ -119,7 +119,7 @@
 %endif
 
 %global upver        7.2.14
-%global rcver        RC1
+#global rcver        RC1
 
 Summary: PHP scripting language for creating dynamic web sites
 Name: php
@@ -1818,7 +1818,9 @@ for mod in pgsql odbc ldap snmp xmlrpc imap json \
     # some extensions have their own config file
     if [ -f ${ini} ]; then
       cp -p ${ini} $RPM_BUILD_ROOT%{_sysconfdir}/php.d/${ini}
+      %if %{with_zts}
       cp -p ${ini} $RPM_BUILD_ROOT%{_sysconfdir}/php-zts.d/${ini}
+      %endif
     else
       cat > $RPM_BUILD_ROOT%{_sysconfdir}/php.d/${ini} <<EOF
 ; Enable ${mod} extension module
@@ -1878,9 +1880,11 @@ cat files.curl files.phar files.fileinfo \
 
 # The default Zend OPcache blacklist file
 install -m 644 %{SOURCE51} $RPM_BUILD_ROOT%{_sysconfdir}/php.d/opcache-default.blacklist
+%if %{with_zts}
 install -m 644 %{SOURCE51} $RPM_BUILD_ROOT%{_sysconfdir}/php-zts.d/opcache-default.blacklist
 sed -e '/blacklist_filename/s/php.d/php-zts.d/' \
     -i $RPM_BUILD_ROOT%{_sysconfdir}/php-zts.d/10-opcache.ini
+%endif
 
 # Install the macros file:
 sed -e "s/@PHP_APIVER@/%{apiver}%{isasuffix}/" \
@@ -1909,7 +1913,7 @@ rm -f README.{Zeus,QNX,CVS-RULES}
 
 
 %pre common
-%if %{?fedora}%{!?fedora:99} < 25
+%if %{?fedora}%{!?fedora:99} < 28
 echo -e "WARNING : Fedora %{fedora} is now EOL :"
 echo -e "You should consider upgrading to a supported release.\n"
 %endif
@@ -2164,6 +2168,9 @@ fi
 
 
 %changelog
+* Tue Jan  8 2019 Remi Collet <remi@remirepo.net> - 7.2.14-1
+- Update to 7.2.14 - http://www.php.net/releases/7_2_14.php
+
 * Tue Dec 18 2018 Remi Collet <remi@remirepo.net> - 7.2.14~RC1-1
 - update to 7.2.14RC1
 - oci8 version is now 2.2.0
-- 
cgit