update to 7.4.8RC1
drop patch to fix PHP_UNAME
This commit is contained in:
parent
ba2672613a
commit
ac2bd5d87b
@ -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])
|
|
12
php.spec
12
php.spec
@ -55,8 +55,8 @@
|
|||||||
%bcond_with tidy
|
%bcond_with tidy
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%global upver 7.4.7
|
%global upver 7.4.8
|
||||||
#global rcver RC1
|
%global rcver RC1
|
||||||
|
|
||||||
Summary: PHP scripting language for creating dynamic web sites
|
Summary: PHP scripting language for creating dynamic web sites
|
||||||
Name: php
|
Name: php
|
||||||
@ -103,8 +103,6 @@ Patch42: php-7.3.3-systzdata-v18.patch
|
|||||||
Patch43: php-7.4.0-phpize.patch
|
Patch43: php-7.4.0-phpize.patch
|
||||||
# Use -lldap_r for OpenLDAP
|
# Use -lldap_r for OpenLDAP
|
||||||
Patch45: php-7.4.0-ldap_r.patch
|
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
|
# drop "Configure command" from phpinfo output
|
||||||
Patch47: php-5.6.3-phpinfo.patch
|
Patch47: php-5.6.3-phpinfo.patch
|
||||||
|
|
||||||
@ -728,7 +726,6 @@ in pure PHP.
|
|||||||
%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
|
%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
|
||||||
%patch45 -p1 -b .ldap_r
|
%patch45 -p1 -b .ldap_r
|
||||||
%endif
|
%endif
|
||||||
%patch46 -p1 -b .fixheader
|
|
||||||
%patch47 -p1 -b .phpinfo
|
%patch47 -p1 -b .phpinfo
|
||||||
|
|
||||||
# upstream patches
|
# upstream patches
|
||||||
@ -823,6 +820,7 @@ cp %{SOURCE50} %{SOURCE51} %{SOURCE53} .
|
|||||||
%build
|
%build
|
||||||
# Set build date from https://reproducible-builds.org/specs/source-date-epoch/
|
# Set build date from https://reproducible-builds.org/specs/source-date-epoch/
|
||||||
export SOURCE_DATE_EPOCH=$(date +%s -r NEWS)
|
export SOURCE_DATE_EPOCH=$(date +%s -r NEWS)
|
||||||
|
export PHP_UNAME=$(uname)
|
||||||
|
|
||||||
# Force use of system libtool:
|
# Force use of system libtool:
|
||||||
libtoolize --force --copy
|
libtoolize --force --copy
|
||||||
@ -1524,6 +1522,10 @@ systemctl try-restart php-fpm.service >/dev/null 2>&1 || :
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%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 16 2020 Remi Collet <remi@remirepo.net> - 7.4.7-2
|
* Tue Jun 16 2020 Remi Collet <remi@remirepo.net> - 7.4.7-2
|
||||||
- disable build of mod_php
|
- disable build of mod_php
|
||||||
https://fedoraproject.org/wiki/Changes/drop_mod_php
|
https://fedoraproject.org/wiki/Changes/drop_mod_php
|
||||||
|
4
sources
4
sources
@ -1,2 +1,2 @@
|
|||||||
SHA512 (php-7.4.7.tar.xz) = 5b3ba690e610e0511675f06a10afe9edbcfa90b5b16956d22aab225cdf140b55e5a8a551e7b189d30404981c94c6921b8c4aed00102546cfa38784a719704b80
|
SHA512 (php-7.4.8RC1.tar.xz) = ca9a17b4c36c459495407ad9b636b778d8d9ec9a8300ec37a3421c59547da51a3e63b098f5c95e009922135d712f0634702096bb6357b73cd54687d797db93ee
|
||||||
SHA512 (php-7.4.7.tar.xz.asc) = bc8607e47d658572468f608be5f7b4fe7d5eb884ae38f99b65f3d7755f88b4f86f0645ca17d7f8fefa74836c6f3a4dc08396685ca7de4898060e62a1c9a6ac11
|
SHA512 (php-7.4.8RC1.tar.xz.asc) = f643b33e3c559944a794e074cc2becf6920954e0eae11a361ab4742c9572c00c097aa6aeece5960e95a31a5be8e7873133f7535612e2d2e745f7edb894734616
|
||||||
|
Loading…
Reference in New Issue
Block a user