From 94bc3dfc0da150a9325dcd84aabcdcdac99a1aad Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Tue, 29 Aug 2017 14:53:45 +0200
Subject: update to 7.2.0RC1

---
 failed.txt        |  6 ++----
 php-timelib.patch | 30 ++++++++++++++++++++++++++++++
 php.spec          | 12 +++++++++---
 3 files changed, 41 insertions(+), 7 deletions(-)
 create mode 100644 php-timelib.patch

diff --git a/failed.txt b/failed.txt
index fa6165b..788a4e9 100644
--- a/failed.txt
+++ b/failed.txt
@@ -1,4 +1,4 @@
-===== 7.1.0beta3 (2017-08-17)
+===== 7.1.0RC1 (2017-08-31)
 
 $ grep -r 'Tests failed' /var/lib/mock/scl72*/build.log
 /var/lib/mock/scl72el6x/build.log:Tests failed    :     0
@@ -6,11 +6,9 @@ $ grep -r 'Tests failed' /var/lib/mock/scl72*/build.log
 /var/lib/mock/scl70fc24x/build.log:Tests failed    :    0
 /var/lib/mock/scl70fc25x/build.log:Tests failed    :    0
 /var/lib/mock/scl70fc26x/build.log:Tests failed    :    0
-/var/lib/mock/scl70fc27x/build.log:Tests failed    :    1
+/var/lib/mock/scl70fc27x/build.log:Tests failed    :    0
 
 
-fc27x:
-	5	substr_compare() [ext/standard/tests/strings/substr_compare.phpt]
 
 
 (1)	proc_open give erratic test results :(
diff --git a/php-timelib.patch b/php-timelib.patch
new file mode 100644
index 0000000..dd8d8cf
--- /dev/null
+++ b/php-timelib.patch
@@ -0,0 +1,30 @@
+diff --git a/timelib_private.h b/timelib_private.h
+index cd402e0..efc7c80 100644
+--- a/ext/date/lib/timelib_private.h
++++ b/ext/date/lib/timelib_private.h
+@@ -115,7 +115,7 @@
+ 		m = NULL;   \
+ 	}
+ 
+-typedef struct ttinfo
++struct ttinfo
+ {
+ 	int32_t      offset;
+ 	int          isdst;
+@@ -123,13 +123,13 @@ typedef struct ttinfo
+ 
+ 	unsigned int isstdcnt;
+ 	unsigned int isgmtcnt;
+-} ttinfo;
++};
+ 
+-typedef struct tlinfo
++struct tlinfo
+ {
+ 	int32_t  trans;
+ 	int32_t  offset;
+-} tlinfo;
++};
+ 
+ 
+ #ifndef LONG_MAX
diff --git a/php.spec b/php.spec
index a7d60eb..97f9f5a 100644
--- a/php.spec
+++ b/php.spec
@@ -126,11 +126,11 @@
 
 %global gh_commit    c22cda5999eaaaa50df0b7977f51853cbf1988a3
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
-%global gh_date      20170828
+#global gh_date      20170828
 %global gh_owner     php
 %global gh_project   php-src
-#global rcver        beta3
-%global rpmrel       19
+%global rcver        RC1
+%global rpmrel       21
 
 
 Summary: PHP scripting language for creating dynamic web sites
@@ -178,6 +178,8 @@ 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
+# From https://github.com/derickr/timelib/pull/21
+Patch10: php-timelib.patch
 
 # Functional changes
 Patch40: php-7.1.3-dlopen.patch
@@ -907,6 +909,7 @@ low-level PHP extension for the libsodium cryptographic library.
 %if 0%{?rhel}
 %patch9 -p1 -b .curltls
 %endif
+%patch10 -p1 -b .timelib
 
 %patch40 -p1 -b .dlopen
 %if 0%{?fedora} >= 25 || 0%{?rhel} >= 6
@@ -1839,6 +1842,9 @@ fi
 
 
 %changelog
+* Tue Aug 29 2017 Remi Collet <remi@remirepo.net> - 7.2.0-0.21.RC1
+- update to 7.2.0RC1
+
 * Mon Aug 28 2017 Remi Collet <remi@remirepo.net> - 7.2.0-0.19.20170827.c22cda5
 - test build from git snapshot
 - refresh configuration files, sync with upstream, drop .so suffix
-- 
cgit