From 2e43d27999bf2c74044786883fea888778dd0485 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 11 Oct 2019 09:58:31 +0200 Subject: test build with more upstream patches --- php.spec | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'php.spec') diff --git a/php.spec b/php.spec index ee0f513..8592374 100644 --- a/php.spec +++ b/php.spec @@ -108,7 +108,7 @@ Summary: PHP scripting language for creating dynamic web sites Name: %{?scl_prefix}php Version: %{upver}%{?lower:~%{lower}}%{?gh_date:.%{gh_date}} -Release: 26%{?dist} +Release: 27%{?dist} # All files licensed under PHP version 3.01, except # Zend is licensed under Zend # TSRM is licensed under BSD @@ -166,8 +166,10 @@ Patch47: php-5.6.3-phpinfo.patch Patch91: php-7.2.0-oci8conf.patch # Upstream fixes (100+) -Patch100: https://github.com/php/php-src/commit/f633c347574c0d814050b4bf2493e0cac6a5988c.patch -Patch101: https://github.com/php/php-src/commit/e1362b3cf0021c1c8492594da08b7a017b3585ba.patch +Patch100: https://github.com/php/php-src/commit/b64a182233344030dee3fb269c1d60cf1a23b106.patch +Patch101: https://github.com/php/php-src/commit/1bb1a1ee285e0a41247f2f60e8f0f03e8a1d9325.patch +Patch102: https://github.com/php/php-src/commit/33958ccb3600daa3a3b96671aadada5e75bfd075.patch +Patch103: https://github.com/php/php-src/commit/e1362b3cf0021c1c8492594da08b7a017b3585ba.patch # Security fixes (200+) @@ -940,8 +942,10 @@ sed -e 's/php-devel/%{?scl_prefix}php-devel/' -i scripts/phpize.in %patch91 -p1 -b .remi-oci8 # upstream patches -%patch100 -p1 -R -%patch101 -p1 -b .up +%patch100 -p1 -b .up +%patch101 -p1 -b .up1 +%patch102 -p1 -b .up2 +%patch103 -p1 -b .up3 # security patches @@ -1808,6 +1812,9 @@ fi %changelog +* Fri Oct 11 2019 Remi Collet - 7.4.0~rc3-27 +- test build with more upstream patches + * Thu Oct 10 2019 Remi Collet - 7.4.0~rc3-26 - fix librt issue on F31 using upstream patch -- cgit