diff options
| -rw-r--r-- | failed.txt | 2 | ||||
| -rw-r--r-- | php-7.2.0-fixheader.patch | 15 | ||||
| -rw-r--r-- | php-7.2.2-fixheader.patch | 12 | ||||
| -rw-r--r-- | php.spec | 13 |
4 files changed, 23 insertions, 19 deletions
@@ -1,4 +1,4 @@ -===== 7.2.1 (2018-01-04) +===== 7.2.2RC1 (2018-01-18) $ grep -r 'Tests failed' /var/lib/mock/scl72*/build.log /var/lib/mock/scl72el6x/build.log:Tests failed : 0 diff --git a/php-7.2.0-fixheader.patch b/php-7.2.0-fixheader.patch deleted file mode 100644 index bc822fd..0000000 --- a/php-7.2.0-fixheader.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- php-7.2.0/configure.ac.fixheader 2017-04-12 09:42:21.510812285 +0200 -+++ php-7.2.0/configure.ac 2017-04-12 09:43:45.055224385 +0200 -@@ -1263,10 +1263,10 @@ - EXTRA_LDFLAGS="$EXTRA_LDFLAGS $PHP_LDFLAGS" - EXTRA_LDFLAGS_PROGRAM="$EXTRA_LDFLAGS_PROGRAM $PHP_LDFLAGS" - --PHP_BUILD_DATE=`date '+%Y-%m-%d'` -+PHP_BUILD_DATE=`date '+%Y-%m-%d' -r $srcdir/NEWS` - 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/php-7.2.2-fixheader.patch b/php-7.2.2-fixheader.patch new file mode 100644 index 0000000..dc2a080 --- /dev/null +++ b/php-7.2.2-fixheader.patch @@ -0,0 +1,12 @@ +diff -up php-7.2.2RC1/configure.ac.fixheader php-7.2.2RC1/configure.ac +--- php-7.2.2RC1/configure.ac.fixheader 2018-01-16 09:14:15.231218443 +0100 ++++ php-7.2.2RC1/configure.ac 2018-01-16 09:17:21.740382942 +0100 +@@ -1272,7 +1272,7 @@ EXTRA_LDFLAGS_PROGRAM="$EXTRA_LDFLAGS_PR + PHP_BUILD_DATE=`date --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +%Y-%m-%d` + 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]) @@ -124,8 +124,8 @@ %global db_devel libdb-devel %endif -%global upver 7.2.1 -#global rcver RC1 +%global upver 7.2.2 +%global rcver RC1 Summary: PHP scripting language for creating dynamic web sites Name: %{?scl_prefix}php @@ -174,7 +174,7 @@ Patch43: php-5.4.0-phpize.patch # Use -lldap_r for OpenLDAP Patch45: php-5.6.3-ldap_r.patch # Make php_config.h constant across builds -Patch46: php-7.2.0-fixheader.patch +Patch46: php-7.2.2-fixheader.patch # drop "Configure command" from phpinfo output Patch47: php-5.6.3-phpinfo.patch @@ -1064,6 +1064,9 @@ exit 1 %build %{?dtsenable} +# Set build date from https://reproducible-builds.org/specs/source-date-epoch/ +export SOURCE_DATE_EPOCH=$(date +%s -r NEWS) + # aclocal workaround - to be improved cat $(aclocal --print-ac-dir)/{libtool,ltoptions,ltsugar,ltversion,lt~obsolete}.m4 >>aclocal.m4 @@ -1839,6 +1842,10 @@ fi %changelog +* Tue Jan 16 2018 Remi Collet <remi@remirepo.net> - 7.2.2~RC1-1 +- update to 7.2.2RC1 +- define SOURCE_DATE_EPOCH for reproducible build + * Wed Jan 3 2018 Remi Collet <remi@remirepo.net> - 7.2.1-1 - Update to 7.2.1 - http://www.php.net/releases/7_2_1.php |