summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--failed.txt10
-rw-r--r--php-7.2.4-fixheader.patch12
-rw-r--r--php74.spec16
3 files changed, 15 insertions, 23 deletions
diff --git a/failed.txt b/failed.txt
index 017f1a6..07544ee 100644
--- a/failed.txt
+++ b/failed.txt
@@ -1,17 +1,17 @@
-===== 7.4.7 (2020-06-11)
+===== 7.4.8RC1 (2020-06-25)
$ grep -ar 'Tests failed' /var/lib/mock/{fc,el}*/build.log
/var/lib/mock/el7x/build.log:Tests failed : 0
-/var/lib/mock/el8x74/build.log:Tests failed : 16
-/var/lib/mock/fc30i/build.log:Tests failed : 1
+/var/lib/mock/el8x74/build.log:Tests failed : 1
+/var/lib/mock/fc30i/build.log:Tests failed : 0
/var/lib/mock/fc30x/build.log:Tests failed : 0
/var/lib/mock/fc31x/build.log:Tests failed : 0
/var/lib/mock/fc32x/build.log:Tests failed : 0
-fc30i:
- Test disk_free_space and its alias diskfreespace() functions : basic functionality [ext/standard/tests/file/disk_free_space_basic.phpt]
+el8x:
+ 3 Bug #78338 (Array cross-border reading in PCRE) [ext/pcre/tests/bug78338.phpt]
1 proc_open give erratic test results :(
diff --git a/php-7.2.4-fixheader.patch b/php-7.2.4-fixheader.patch
deleted file mode 100644
index 52a4121..0000000
--- a/php-7.2.4-fixheader.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up php-7.2.4RC1/configure.ac.fixheader php-7.2.4RC1/configure.ac
---- php-7.2.4RC1/configure.ac.fixheader 2018-03-13 12:42:47.594623100 +0100
-+++ php-7.2.4RC1/configure.ac 2018-03-13 12:43:35.591871825 +0100
-@@ -1275,7 +1275,7 @@ PHP_BUILD_DATE=`date -u +%Y-%m-%d`
- fi
- AC_DEFINE_UNQUOTED(PHP_BUILD_DATE,"$PHP_BUILD_DATE",[PHP build date])
-
--PHP_UNAME=`uname -a | xargs`
-+PHP_UNAME=`uname | xargs`
- AC_DEFINE_UNQUOTED(PHP_UNAME,"$PHP_UNAME",[uname -a output])
- PHP_OS=`uname | xargs`
- AC_DEFINE_UNQUOTED(PHP_OS,"$PHP_OS",[uname output])
diff --git a/php74.spec b/php74.spec
index 545d688..188cb70 100644
--- a/php74.spec
+++ b/php74.spec
@@ -95,9 +95,9 @@
%global with_libzip 1
%global with_zip 0
-%global upver 7.4.7
-#global rcver RC1
-#global lower RC1
+%global upver 7.4.8
+%global rcver RC1
+%global lower RC1
Summary: PHP scripting language for creating dynamic web sites
Name: php
@@ -150,8 +150,6 @@ Patch42: php-7.3.3-systzdata-v18.patch
Patch43: php-7.4.0-phpize.patch
# Use -lldap_r for OpenLDAP
Patch45: php-7.4.0-ldap_r.patch
-# Make php_config.h constant across builds
-Patch46: php-7.2.4-fixheader.patch
# drop "Configure command" from phpinfo output
Patch47: php-5.6.3-phpinfo.patch
@@ -1148,7 +1146,6 @@ in pure PHP.
%endif
%patch43 -p1 -b .headers
%patch45 -p1 -b .ldap_r
-%patch46 -p1 -b .fixheader
%patch47 -p1 -b .phpinfo
%patch91 -p1 -b .remi-oci8
@@ -1292,6 +1289,7 @@ fi
# Set build date from https://reproducible-builds.org/specs/source-date-epoch/
export SOURCE_DATE_EPOCH=$(date +%s -r NEWS)
+export PHP_UNAME=$(uname)
# Force use of system libtool:
libtoolize --force --copy
@@ -1923,6 +1921,8 @@ rm -rf $RPM_BUILD_ROOT%{_libdir}/php/modules/*.a \
$RPM_BUILD_ROOT%{_libdir}/php-zts/modules/*.a \
$RPM_BUILD_ROOT%{_bindir}/{phptar} \
$RPM_BUILD_ROOT%{_datadir}/pear \
+ $RPM_BUILD_ROOT%{_bindir}/zts-phar* \
+ $RPM_BUILD_ROOT%{_mandir}/man1/zts-phar* \
$RPM_BUILD_ROOT%{_libdir}/libphp7.a \
$RPM_BUILD_ROOT%{_libdir}/libphp7.la
@@ -2160,6 +2160,10 @@ fi
%changelog
+* Tue Jun 23 2020 Remi Collet <remi@remirepo.net> - 7.4.8~RC1-1
+- update to 7.4.8RC1
+- drop patch to fix PHP_UNAME
+
* Tue Jun 9 2020 Remi Collet <remi@remirepo.net> - 7.4.7-1
- Update to 7.4.7 - http://www.php.net/releases/7_4_7.php
- rebuild using oniguruma5php