diff options
| -rw-r--r-- | php-upstream.patch | 26 | ||||
| -rw-r--r-- | php.spec | 7 |
2 files changed, 4 insertions, 29 deletions
diff --git a/php-upstream.patch b/php-upstream.patch deleted file mode 100644 index b9d5ca4..0000000 --- a/php-upstream.patch +++ /dev/null @@ -1,26 +0,0 @@ -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 - @@ -130,7 +130,7 @@ Summary: PHP scripting language for creating dynamic web sites Name: %{?scl_prefix}php Version: %{upver}%{?rcver:~%{rcver}} -Release: 1%{?dist} +Release: 2%{?dist} # All files licensed under PHP version 3.01, except # Zend is licensed under Zend # TSRM is licensed under BSD @@ -182,7 +182,6 @@ Patch47: php-5.6.3-phpinfo.patch Patch91: php-7.2.0-oci8conf.patch # Upstream fixes (100+) -Patch100: php-upstream.patch # Security fixes (200+) @@ -921,7 +920,6 @@ low-level PHP extension for the libsodium cryptographic library. %patch91 -p1 -b .remi-oci8 # upstream patches -%patch100 -p1 -R -b .up # security patches @@ -1856,6 +1854,9 @@ fi %changelog +* Thu Jun 21 2018 Remi Collet <remi@remirepo.net> - 7.3.0~alpha2-2 +- update to 7.3.0alpha2 new sources + * 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 |