diff --git a/192c7f0edcff63024426955f0796332499671fb7.patch b/192c7f0edcff63024426955f0796332499671fb7.patch new file mode 100644 index 0000000..5d797e3 --- /dev/null +++ b/192c7f0edcff63024426955f0796332499671fb7.patch @@ -0,0 +1,25 @@ +From 192c7f0edcff63024426955f0796332499671fb7 Mon Sep 17 00:00:00 2001 +From: Nikita Popov +Date: Wed, 2 Oct 2019 11:02:10 +0200 +Subject: [PATCH] Use different fatal error in test + +This is no longer a fatal error in 7.4... +--- + tests/apc_entry_003.phpt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tests/apc_entry_003.phpt b/tests/apc_entry_003.phpt +index 0fd7be4..f066583 100644 +--- a/tests/apc_entry_003.phpt ++++ b/tests/apc_entry_003.phpt +@@ -9,8 +9,8 @@ apc.enable_cli=1 + + --EXPECTF-- +-Fatal error: Interface 'Y' not found in %s on line %d ++Fatal error: Trait 'T' not found in %s on line %d diff --git a/php-pecl-apcu.spec b/php-pecl-apcu.spec index 84f455f..87197c7 100644 --- a/php-pecl-apcu.spec +++ b/php-pecl-apcu.spec @@ -24,6 +24,7 @@ Source2: %{pecl_name}-panel.conf Source3: %{pecl_name}.conf.php Patch0: https://github.com/krakjoe/apcu/commit/50353e06d89a0bf0a77287f9d232f3a2edb60667.patch +Patch1: https://github.com/krakjoe/apcu/commit/192c7f0edcff63024426955f0796332499671fb7.patch License: PHP URL: http://pecl.php.net/package/APCu @@ -87,6 +88,7 @@ sed -e '/LICENSE/s/role="doc"/role="src"/' -i package.xml cd NTS %patch0 -p1 +%patch1 -p1 # Sanity check, really often broken extver=$(sed -n '/#define PHP_APCU_VERSION/{s/.* "//;s/".*$//;p}' php_apc.h) @@ -221,6 +223,7 @@ REPORT_EXIT_STATUS=1 \ %changelog * Thu Oct 03 2019 Remi Collet - 5.1.17-3 - rebuild for https://fedoraproject.org/wiki/Changes/php74 +- add upstream patches for test suite * Fri Jul 26 2019 Fedora Release Engineering - 5.1.17-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild