From e9d81d22d04f6e5e4e62228f40d557e81fad61d7 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 1 Oct 2019 11:26:07 +0200 Subject: 7.4.0RC3 --- failed.txt | 4 ++-- php-upstream.patch | 26 -------------------------- php74.spec | 29 ++++++++++------------------- 3 files changed, 12 insertions(+), 47 deletions(-) delete mode 100644 php-upstream.patch diff --git a/failed.txt b/failed.txt index 01780d3..62aec84 100644 --- a/failed.txt +++ b/failed.txt @@ -1,4 +1,4 @@ -===== 7.4.0RC2 (2019-09-19) +===== 7.4.0RC3 (2019-10-03) $ grep -ar 'Tests failed' /var/lib/mock/{fc,el}*/build.log @@ -12,7 +12,7 @@ $ grep -ar 'Tests failed' /var/lib/mock/{fc,el}*/build.log /var/lib/mock/fc31x/build.log:Tests failed : 0 -fc30i +fc30x 6 SPL: DirectoryIterator and clone [ext/spl/tests/dit_004.phpt] diff --git a/php-upstream.patch b/php-upstream.patch deleted file mode 100644 index f75d8d9..0000000 --- a/php-upstream.patch +++ /dev/null @@ -1,26 +0,0 @@ -From dc40332bb2276553ea10bca574f03a8dc9bea53d Mon Sep 17 00:00:00 2001 -From: Remi Collet -Date: Fri, 20 Sep 2019 13:30:13 +0200 -Subject: [PATCH] Fixed bug #78574 (broken shared build) - ---- - NEWS | 3 +++ - ext/gmp/config.m4 | 2 +- - 2 files changed, 4 insertions(+), 1 deletion(-) - -diff --git a/ext/gmp/config.m4 b/ext/gmp/config.m4 -index aa4936b3c3..fa55751cf1 100644 ---- a/ext/gmp/config.m4 -+++ b/ext/gmp/config.m4 -@@ -10,7 +10,7 @@ if test "$PHP_GMP" != "no"; then - AC_MSG_ERROR([GNU MP Library version 4.2 or greater required.]) - ]) - -- PHP_ADD_LIBRARY(gmp, GMP_SHARED_LIBADD) -+ PHP_ADD_LIBRARY(gmp,,GMP_SHARED_LIBADD) - else - if test ! -f $PHP_GMP/include/gmp.h; then - AC_MSG_ERROR(Unable to locate gmp.h) --- -2.11.0 - diff --git a/php74.spec b/php74.spec index 5d43857..633c579 100644 --- a/php74.spec +++ b/php74.spec @@ -97,13 +97,13 @@ %global with_zip 0 %global upver 7.4.0 -%global rcver RC2 -%global lower RC2 +%global rcver RC3 +%global lower RC3 Summary: PHP scripting language for creating dynamic web sites Name: php Version: %{upver}%{?rcver:~%{lower}} -Release: 4%{?dist} +Release: 5%{?dist} # All files licensed under PHP version 3.01, except # Zend is licensed under Zend # TSRM is licensed under BSD @@ -168,7 +168,6 @@ Patch91: php-7.2.0-oci8conf.patch Patch300: php-7.0.10-datetests.patch # WIP -Patch400: php-upstream.patch BuildRequires: gnupg2 BuildRequires: bzip2-devel @@ -252,14 +251,6 @@ Recommends: php-xml%{?_isa} = %{version}-%{release} Requires: php-cli%{?_isa} = %{version}-%{release} %endif -%if 0%{?fedora} < 20 && 0%{?rhel} < 7 -# Don't provides extensions, which are not shared library, as .so -%{?filter_provides_in: %filter_provides_in %{_libdir}/php/modules/.*\.so$} -%{?filter_provides_in: %filter_provides_in %{_libdir}/php-zts/modules/.*\.so$} -%{?filter_provides_in: %filter_provides_in %{_httpd_moddir}/.*\.so$} -%{?filter_setup} -%endif - %description PHP is an HTML-embedded scripting language. PHP attempts to make it @@ -1152,13 +1143,11 @@ in pure PHP. %patch9 -p1 -b .curltls %endif -%if 0%{?fedora} >= 28 || 0%{?rhel} >= 6 +%if 0%{?fedora} >= 29 || 0%{?rhel} >= 6 %patch42 -p1 -b .systzdata %endif %patch43 -p1 -b .headers -%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 %patch45 -p1 -b .ldap_r -%endif %patch46 -p1 -b .fixheader %patch47 -p1 -b .phpinfo @@ -1168,13 +1157,12 @@ in pure PHP. # security patches -# Fixes for tests -%if 0%{?fedora} >= 25 || 0%{?rhel} >= 6 +# Fixes for tests related to tzdata +%if 0%{?fedora} >= 29 || 0%{?rhel} >= 6 %patch300 -p1 -b .datetests %endif # WIP patch -%patch400 -p1 # Prevent %%doc confusion over LICENSE files cp Zend/LICENSE Zend/ZEND_LICENSE @@ -1369,7 +1357,7 @@ ln -sf ../configure --with-layout=GNU \ --with-kerberos \ --with-libxml \ -%if 0%{?fedora} >= 28 || 0%{?rhel} >= 6 +%if 0%{?fedora} >= 29 || 0%{?rhel} >= 6 --with-system-tzdata \ %endif --with-mhash \ @@ -2148,6 +2136,9 @@ fi %changelog +* Tue Oct 1 2019 Remi Collet - 7.4.0~RC3-5 +- update to 7.4.0RC3 + * Fri Sep 20 2019 Remi Collet - 7.4.0~RC2-4 - fix broken gmp extension https://bugs.php.net/78574 -- cgit