From d53f721ee88ca5e6b1f0e071b571a954b7ac0854 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 8 Jun 2020 11:26:09 +0200 Subject: new snapshot drop patch to fix PHP_UNAME --- php-7.2.4-fixheader.patch | 12 ------------ php.spec | 14 ++++++++------ 2 files changed, 8 insertions(+), 18 deletions(-) delete mode 100644 php-7.2.4-fixheader.patch 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/php.spec b/php.spec index 3aeed0b..107ad5e 100644 --- a/php.spec +++ b/php.spec @@ -97,9 +97,9 @@ %global with_zip 0 -%global gh_commit 6b45039fb768a038783dff496ce14780c478482a +%global gh_commit cd3f42f17efe3e0a8584d1048b307cf00e209468 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) -%global gh_date 20200602 +%global gh_date 20200608 %global gh_owner php %global gh_project php-src %global upver 8.0.0 @@ -109,7 +109,7 @@ Summary: PHP scripting language for creating dynamic web sites Name: %{?scl_prefix}php Version: %{upver}%{?lower:~%{lower}}%{?gh_date:.%{gh_date}} -Release: 16%{?dist} +Release: 17%{?dist} # All files licensed under PHP version 3.01, except # Zend is licensed under Zend # TSRM is licensed under BSD @@ -158,8 +158,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 @@ -912,7 +910,6 @@ sed -e 's/php-devel/%{?scl_prefix}php-devel/' -i scripts/phpize.in %if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 %patch45 -p1 -b .ldap_r %endif -%patch46 -p1 -b .fixheader %patch47 -p1 -b .phpinfo %patch91 -p1 -b .remi-oci8 @@ -1058,6 +1055,7 @@ exit 1 # 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 @@ -1785,6 +1783,10 @@ fi %changelog +* Mon Jun 8 2020 Remi Collet - 8.0.0~DEV.20200608-17 +- new snapshot +- drop patch to fix PHP_UNAME + * Tue Jun 2 2020 Remi Collet - 8.0.0~DEV.20200602-16 - new snapshot - drop xmlrpc extension -- cgit