From 8ca0cc2cf5362d73d0f8715362bb511bc6025432 Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Wed, 1 Feb 2017 10:39:01 +0100
Subject: PHP 7.1.2RC1

---
 failed.txt     |  7 +++++--
 php-intl.patch | 25 -------------------------
 php.spec       | 11 ++++++-----
 3 files changed, 11 insertions(+), 32 deletions(-)
 delete mode 100644 php-intl.patch

diff --git a/failed.txt b/failed.txt
index a461a15..752b7b4 100644
--- a/failed.txt
+++ b/failed.txt
@@ -1,4 +1,4 @@
-===== 7.1.1 (2017-01-19)
+===== 7.1.2RC1 (2017-02-02)
 
 $ grep -r 'Tests failed' /var/lib/mock/scl71*/build.log
 
@@ -7,9 +7,12 @@ $ grep -r 'Tests failed' /var/lib/mock/scl71*/build.log
 /var/lib/mock/scl70fc22x/build.log:Tests failed    :    0
 /var/lib/mock/scl70fc23x/build.log:Tests failed    :    0
 /var/lib/mock/scl70fc24x/build.log:Tests failed    :    0
-/var/lib/mock/scl70fc25x/build.log:Tests failed    :    0
+/var/lib/mock/scl70fc25x/build.log:Tests failed    :    1
 
 
+fc25x
+	*	Bug #60120 proc_open hangs with stdin/out with 2048+ bytes [ext/standard/tests/streams/proc_open_bug60120.phpt]
+
 
 *	proc_open give erratic test results :(
 **	fixed upstream
diff --git a/php-intl.patch b/php-intl.patch
deleted file mode 100644
index a0ce193..0000000
--- a/php-intl.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 6af22d0d3ed224d89be1d1e9e53ff7e2e2e5439d Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@php.net>
-Date: Wed, 18 Jan 2017 13:00:49 +0100
-Subject: [PATCH] Fix #73956 Link use CC instead of CXX
-
----
- ext/intl/config.m4 | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/ext/intl/config.m4 b/ext/intl/config.m4
-index dd28276..ca2cd82 100644
---- a/ext/intl/config.m4
-+++ b/ext/intl/config.m4
-@@ -86,7 +86,7 @@ if test "$PHP_INTL" != "no"; then
-     breakiterator/codepointiterator_methods.cpp \
-     uchar/uchar.c \
-     idn/idn.c \
--    $icu_spoof_src, $ext_shared,,$ICU_INCS -Wno-write-strings -D__STDC_LIMIT_MACROS -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
-+    $icu_spoof_src, $ext_shared,,$ICU_INCS -Wno-write-strings -D__STDC_LIMIT_MACROS -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1,cxx)
-   PHP_ADD_BUILD_DIR($ext_builddir/collator)
-   PHP_ADD_BUILD_DIR($ext_builddir/converter)
-   PHP_ADD_BUILD_DIR($ext_builddir/common)
--- 
-2.1.4
-
diff --git a/php.spec b/php.spec
index f796268..6adb715 100644
--- a/php.spec
+++ b/php.spec
@@ -124,13 +124,13 @@
 %global db_devel  libdb-devel
 %endif
 
-#global rcver        RC1
-%global rpmrel       3
+%global rcver        RC1
+%global rpmrel       1
 
 
 Summary: PHP scripting language for creating dynamic web sites
 Name: %{?scl_prefix}php
-Version: 7.1.1
+Version: 7.1.2
 Release: %{?rcver:0.}%{rpmrel}%{?rcver:.%{rcver}}%{?dist}
 # All files licensed under PHP version 3.01, except
 # Zend is licensed under Zend
@@ -183,7 +183,6 @@ Patch47: php-5.6.3-phpinfo.patch
 Patch91: php-5.6.3-oci8conf.patch
 
 # Upstream fixes (100+)
-Patch100: php-intl.patch
 
 # Security fixes (200+)
 
@@ -895,7 +894,6 @@ support for JavaScript Object Notation (JSON) to PHP.
 %patch91 -p1 -b .remi-oci8
 
 # upstream patches
-%patch100 -p1 -b .73956
 
 # security patches
 
@@ -1810,6 +1808,9 @@ fi
 
 
 %changelog
+* Wed Feb  1 2017 Remi Collet <remi@fedoraproject.org> 7.1.2-0.1.RC1
+- Update to 7.1.2RC1
+
 * Wed Jan 18 2017 Remi Collet <remi@fedoraproject.org> 7.1.1-3
 - EL-7: add patch for https://bugs.php.net/73956
 - switch back to gcc 6.2
-- 
cgit