From 46060665ed6d9e236555dd78a905c4dfb8bfbe06 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Tue, 22 Jan 2019 16:40:58 +0100
Subject: update to 7.3.2RC1 update system tzdata patch for timelib 2018.01

---
 php73.spec | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

(limited to 'php73.spec')

diff --git a/php73.spec b/php73.spec
index 6c84a9a..27f7909 100644
--- a/php73.spec
+++ b/php73.spec
@@ -118,9 +118,9 @@
 %global db_devel  libdb-devel
 %endif
 
-%global upver        7.3.1
-#global rcver        RC1
-#global lower        RC1
+%global upver        7.3.2
+%global rcver        RC1
+%global lower        RC1
 
 Summary: PHP scripting language for creating dynamic web sites
 Name: php
@@ -167,7 +167,7 @@ Patch9: php-7.0.7-curl.patch
 
 # Functional changes
 Patch40: php-7.2.4-dlopen.patch
-Patch42: php-7.2.3-systzdata-v16.patch
+Patch42: php-7.3.2-systzdata-v17.patch
 # See http://bugs.php.net/53436
 Patch43: php-7.3.0-phpize.patch
 # Use -lldap_r for OpenLDAP
@@ -189,6 +189,7 @@ Patch91: php-7.2.0-oci8conf.patch
 Patch300: php-7.0.10-datetests.patch
 
 # WIP
+Patch400: php-bug77287.patch
 
 BuildRequires: bzip2-devel, curl-devel >= 7.9
 BuildRequires: httpd-devel >= 2.0.46-1, pam-devel
@@ -1120,7 +1121,7 @@ low-level PHP extension for the libsodium cryptographic library.
 %endif
 
 %patch40 -p1 -b .dlopen
-%if 0%{?fedora} >= 25 || 0%{?rhel} >= 6
+%if 0%{?fedora} >= 28 || 0%{?rhel} >= 6
 %patch42 -p1 -b .systzdata
 %endif
 %patch43 -p1 -b .headers
@@ -1142,6 +1143,7 @@ low-level PHP extension for the libsodium cryptographic library.
 %endif
 
 # WIP patch
+%patch400 -p1 -b .bug77287
 
 # Prevent %%doc confusion over LICENSE files
 cp Zend/LICENSE Zend/ZEND_LICENSE
@@ -1170,6 +1172,12 @@ mkdir build-cgi build-apache build-embedded \
 rm ext/date/tests/timezone_location_get.phpt
 rm ext/date/tests/timezone_version_get.phpt
 rm ext/date/tests/timezone_version_get_basic1.phpt
+%if 0%{?fedora} < 28
+# need tzdata 2018i
+rm ext/date/tests/bug33414-1.phpt
+rm ext/date/tests/bug33415-2.phpt
+rm ext/date/tests/date_modify-1.phpt
+%endif
 # Should be skipped but fails sometime
 rm ext/standard/tests/file/file_get_contents_error001.phpt
 # fails sometime
@@ -1353,7 +1361,7 @@ ln -sf ../configure
     --with-layout=GNU \
     --with-kerberos \
     --with-libxml-dir=%{_prefix} \
-%if 0%{?fedora} >= 25 || 0%{?rhel} >= 6
+%if 0%{?fedora} >= 28 || 0%{?rhel} >= 6
     --with-system-tzdata \
 %endif
     --with-mhash \
@@ -1944,7 +1952,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
@@ -2198,6 +2206,10 @@ fi
 
 
 %changelog
+* Tue Jan 22 2019 Remi Collet <remi@remirepo.net> - 7.3.2~RC1-1
+- update to 7.3.2RC1
+- update system tzdata patch for timelib 2018.01
+
 * Tue Jan  8 2019 Remi Collet <remi@remirepo.net> - 7.3.1-1
 - Update to 7.3.1 - http://www.php.net/releases/7_3_1.php
 
-- 
cgit