From 4b7547daadf3c13951784c3a7c8ef1a3c0b8e246 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Oct 28 2021 12:36:30 +0000 Subject: rebuild for https://fedoraproject.org/wiki/Changes/php81 add patch for test suite with 8.1.0beta2 from https://github.com/laruence/yac/pull/120 --- diff --git a/php-pecl-yac.spec b/php-pecl-yac.spec index 3f412f7..1d0998d 100644 --- a/php-pecl-yac.spec +++ b/php-pecl-yac.spec @@ -19,12 +19,14 @@ Summary: Lockless user data cache Name: php-pecl-%{pecl_name} Version: 2.3.0 -Release: 4%{?dist} +Release: 5%{?dist} License: PHP URL: https://pecl.php.net/package/%{pecl_name} Source0: https://pecl.php.net/get/%{pecl_name}-%{version}.tgz +Patch0: %{pecl_name}-php81.patch + BuildRequires: make BuildRequires: gcc BuildRequires: php-devel >= 7.0 @@ -69,6 +71,8 @@ sed -e 's/role="test"/role="src"/' \ -i package.xml cd NTS +%patch0 -p1 + # drop bundled fastlz to ensure it is not used sed -e '\:name="compressor/fastlz:d' -i ../package.xml rm -r compressor/fastlz @@ -205,6 +209,11 @@ REPORT_EXIT_STATUS=1 \ %changelog +* Thu Oct 28 2021 Remi Collet - 2.3.0-5 +- rebuild for https://fedoraproject.org/wiki/Changes/php81 +- add patch for test suite with 8.1.0beta2 from + https://github.com/laruence/yac/pull/120 + * Fri Jul 23 2021 Fedora Release Engineering - 2.3.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/yac-php81.patch b/yac-php81.patch new file mode 100644 index 0000000..e4d4c45 --- /dev/null +++ b/yac-php81.patch @@ -0,0 +1,19 @@ +From 14fd1ecb6d95b9eecf3356fb2b3f01d937d2e4b5 Mon Sep 17 00:00:00 2001 +From: Remi Collet +Date: Wed, 4 Aug 2021 14:05:13 +0200 +Subject: [PATCH] relax test for 8.1.0beta2 + +--- + tests/023.phpt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/023.phpt b/tests/023.phpt +index 0dce792..1fc658a 100644 +--- a/tests/023.phpt ++++ b/tests/023.phpt +@@ -9,4 +9,4 @@ yac.enable=0 + class Sub extends Yac {}; + ?> + --EXPECTF-- +-Fatal error: Class Sub may not inherit from final class (Yac) in %s023.php on line %d ++Fatal error: Class Sub %s final class %s