From 26c0349c12696cdd0fc47ee6e877fabeae32f337 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 14 Aug 2024 10:01:46 +0200 Subject: test build for upstream patch open https://github.com/php/php-src/pull/15383 fix test expectation open https://github.com/php/php-src/pull/15382 cleanup php.ini --- php.spec | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'php.spec') diff --git a/php.spec b/php.spec index a348542..ad704c5 100644 --- a/php.spec +++ b/php.spec @@ -88,7 +88,7 @@ Summary: PHP scripting language for creating dynamic web sites Name: %{?scl_prefix}php Version: %{upver}%{?rcver:~%{rcver}}%{?gh_date:.%{gh_date}} -Release: 1%{?dist} +Release: 2%{?dist} # All files licensed under PHP version 3.01, except # Zend is licensed under Zend # TSRM is licensed under BSD @@ -149,6 +149,7 @@ Patch48: php-8.3.0-openssl-ec-param.patch # RC Patch # Upstream fixes (100+) +Patch100: upstream.patch # Security fixes (200+) @@ -842,6 +843,7 @@ sed -e 's/php-devel/%{?scl_prefix}php-devel/' -i scripts/phpize.in %patch -P48 -p1 -b .ec-param # upstream patches +%patch -P100 -p1 -b .up # security patches @@ -1636,9 +1638,13 @@ fi %changelog +* Wed Aug 14 2024 Remi Collet - 8.4.0~beta1-2 +- test build for upstream patch +- open https://github.com/php/php-src/pull/15383 fix test expectation +- open https://github.com/php/php-src/pull/15382 cleanup php.ini + * Tue Aug 13 2024 Remi Collet - 8.4.0~beta1-1 - Update to 8.4.0beta1 - * Thu Aug 1 2024 Remi Collet - 8.4.0~alpha4-1 - Update to 8.4.0alpha4 -- cgit