From 7a6c9d12794ffba504797cc937424b9df3d5e623 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Tue, 19 Jun 2018 16:52:39 +0200
Subject: update to 7.3.0alpha2 bump php(zend-abi) and php(api) to 20180606
 revert 5dd1ef90caec3021e6ce55c8554e695edf641eaf

---
 failed.txt         | 12 +++++-------
 php-upstream.patch | 26 ++++++++++++++++++++++++++
 php.spec           | 13 ++++++++++---
 3 files changed, 41 insertions(+), 10 deletions(-)
 create mode 100644 php-upstream.patch

diff --git a/failed.txt b/failed.txt
index fdfd051..9698058 100644
--- a/failed.txt
+++ b/failed.txt
@@ -1,15 +1,13 @@
-===== 7.3.0alpha1 (2018-06-07)
+===== 7.3.0alpha2 (2018-06-21)
 
 $ grep -r 'Tests failed' /var/lib/mock/scl73*/build.log
 
-/var/lib/mock/scl72el6x/build.log:Tests failed    :     1
-/var/lib/mock/scl72el7x/build.log:Tests failed    :     1
-/var/lib/mock/scl72fc27x/build.log:Tests failed    :    1
-/var/lib/mock/scl72fc28x/build.log:Tests failed    :    1
+/var/lib/mock/scl72el6x/build.log:Tests failed    :     0
+/var/lib/mock/scl72el7x/build.log:Tests failed    :     0
+/var/lib/mock/scl72fc27x/build.log:Tests failed    :    0
+/var/lib/mock/scl72fc28x/build.log:Tests failed    :    0
 
 
-el6x, el7x, fc27x, fc28x
-	5	gzfile() with various invalid params [ext/zlib/tests/004-mb.phpt]
 
 
 (1)	proc_open give erratic test results :(
diff --git a/php-upstream.patch b/php-upstream.patch
new file mode 100644
index 0000000..b9d5ca4
--- /dev/null
+++ b/php-upstream.patch
@@ -0,0 +1,26 @@
+From 5dd1ef90caec3021e6ce55c8554e695edf641eaf Mon Sep 17 00:00:00 2001
+From: Stanislav Malyshev <stas@php.net>
+Date: Sun, 17 Jun 2018 16:00:06 -0700
+Subject: [PATCH] ICU 59+ requires C++11 and errors out without the option
+
+---
+ ext/intl/config.m4 | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/ext/intl/config.m4 b/ext/intl/config.m4
+index 52408f8..e8fad2e 100644
+--- a/ext/intl/config.m4
++++ b/ext/intl/config.m4
+@@ -18,6 +18,9 @@ if test "$PHP_INTL" != "no"; then
+   else
+     icu_spoof_src=""
+   fi
++  if test "$icu_version" -ge "59000"; then
++  	ICU_CXXFLAGS="$ICU_CXXFLAGS -std=c++11 -stdlib=libc++"
++  fi
+   PHP_NEW_EXTENSION(intl, php_intl.c \
+     intl_error.c \
+     intl_convert.c \
+-- 
+2.1.4
+
diff --git a/php.spec b/php.spec
index 1f9134e..fd2516e 100644
--- a/php.spec
+++ b/php.spec
@@ -22,8 +22,8 @@
 %endif
 
 # API/ABI check
-%global apiver      20180123
-%global zendver     20170718
+%global apiver      20180606
+%global zendver     20180606
 %global pdover      20170320
 # Extension version
 %global oci8ver     2.1.8
@@ -125,7 +125,7 @@
 %endif
 
 %global upver        7.3.0
-%global rcver        alpha1
+%global rcver        alpha2
 
 Summary: PHP scripting language for creating dynamic web sites
 Name: %{?scl_prefix}php
@@ -182,6 +182,7 @@ Patch47: php-5.6.3-phpinfo.patch
 Patch91: php-7.2.0-oci8conf.patch
 
 # Upstream fixes (100+)
+Patch100: php-upstream.patch
 
 # Security fixes (200+)
 
@@ -920,6 +921,7 @@ low-level PHP extension for the libsodium cryptographic library.
 %patch91 -p1 -b .remi-oci8
 
 # upstream patches
+%patch100 -p1 -R -b .up
 
 # security patches
 
@@ -1854,6 +1856,11 @@ fi
 
 
 %changelog
+* Tue Jun 19 2018 Remi Collet <remi@remirepo.net> - 7.3.0~alpha2-1
+- update to 7.3.0alpha2
+- bump php(zend-abi) and php(api) to 20180606
+- revert 5dd1ef90caec3021e6ce55c8554e695edf641eaf
+
 * Thu Jun  7 2018 Remi Collet <remi@remirepo.net> - 7.3.0~alpha1-1
 - update to 7.3.0alpha1
 - switch from pcre to pcre2
-- 
cgit