diff options
Diffstat (limited to 'php.spec')
| -rw-r--r-- | php.spec | 13 |
1 files changed, 10 insertions, 3 deletions
@@ -97,9 +97,9 @@ %global with_zip 0 -%global gh_commit 6ef0d470bfe3c6f45ff34241d8964a73f494acc5 +%global gh_commit 48a34bc1202e9664121c9e9aa004c79ac71af3f5 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) -%global gh_date 20200422 +%global gh_date 20200427 %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: 4%{?dist} +Release: 5%{?dist} # All files licensed under PHP version 3.01, except # Zend is licensed under Zend # TSRM is licensed under BSD @@ -151,6 +151,8 @@ Patch5: php-7.2.0-includedir.patch Patch6: php-7.4.0-embed.patch Patch8: php-7.4.0-libdb.patch Patch9: php-7.0.7-curl.patch +# revert changes (already reverted upstream in 7.4) +Patch10: php-8.0.0-static.patch # Functional changes Patch42: php-7.3.3-systzdata-v18.patch @@ -930,6 +932,7 @@ in pure PHP. %if 0%{?rhel} %patch9 -p1 -b .curltls %endif +%patch10 -p1 -b .revert %if 0%{?fedora} >= 28 || 0%{?rhel} >= 6 %patch42 -p1 -b .systzdata @@ -1814,6 +1817,10 @@ fi %changelog +* Mon Apr 27 2020 Remi Collet <remi@remirepo.net> - 8.0.0~DEV.20200427-5 +- new snapshot +- revert changes to use non PIC object files + * Wed Apr 22 2020 Remi Collet <remi@remirepo.net> - 8.0.0~DEV.20200422-4 - new snapshot |