From 9ccd2fab278316504f069c847c7302dfd3c6eded Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 3 Oct 2019 09:39:15 +0200 Subject: [PATCH] rebuild for https://fedoraproject.org/wiki/Changes/php74 --- ...3e06d89a0bf0a77287f9d232f3a2edb60667.patch | 26 +++++++++++++++++++ php-pecl-apcu.spec | 8 +++++- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 50353e06d89a0bf0a77287f9d232f3a2edb60667.patch diff --git a/50353e06d89a0bf0a77287f9d232f3a2edb60667.patch b/50353e06d89a0bf0a77287f9d232f3a2edb60667.patch new file mode 100644 index 0000000..4da2788 --- /dev/null +++ b/50353e06d89a0bf0a77287f9d232f3a2edb60667.patch @@ -0,0 +1,26 @@ +From 50353e06d89a0bf0a77287f9d232f3a2edb60667 Mon Sep 17 00:00:00 2001 +From: Nikita Popov +Date: Fri, 7 Jun 2019 10:04:14 +0200 +Subject: [PATCH] Use different fatal error + +The string conversion fatal is an exception in 7.4. +--- + tests/apc_entry_003.phpt | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/tests/apc_entry_003.phpt b/tests/apc_entry_003.phpt +index ef8ace9..0fd7be4 100644 +--- a/tests/apc_entry_003.phpt ++++ b/tests/apc_entry_003.phpt +@@ -8,8 +8,9 @@ apc.enable_cli=1 + --FILE-- + + --EXPECTF-- +-%s fatal error: Object of class stdClass could not be converted to string in %s on line %d ++Fatal error: Interface 'Y' not found in %s on line %d diff --git a/php-pecl-apcu.spec b/php-pecl-apcu.spec index 717afef..84f455f 100644 --- a/php-pecl-apcu.spec +++ b/php-pecl-apcu.spec @@ -17,12 +17,14 @@ Name: php-pecl-apcu Summary: APC User Cache Version: 5.1.17 -Release: 2%{?dist} +Release: 3%{?dist} Source0: http://pecl.php.net/get/%{pecl_name}-%{version}.tgz Source1: %{pecl_name}.ini Source2: %{pecl_name}-panel.conf Source3: %{pecl_name}.conf.php +Patch0: https://github.com/krakjoe/apcu/commit/50353e06d89a0bf0a77287f9d232f3a2edb60667.patch + License: PHP URL: http://pecl.php.net/package/APCu @@ -84,6 +86,7 @@ mv %{pecl_name}-%{version} NTS sed -e '/LICENSE/s/role="doc"/role="src"/' -i package.xml cd NTS +%patch0 -p1 # Sanity check, really often broken extver=$(sed -n '/#define PHP_APCU_VERSION/{s/.* "//;s/".*$//;p}' php_apc.h) @@ -216,6 +219,9 @@ REPORT_EXIT_STATUS=1 \ %changelog +* Thu Oct 03 2019 Remi Collet - 5.1.17-3 +- rebuild for https://fedoraproject.org/wiki/Changes/php74 + * Fri Jul 26 2019 Fedora Release Engineering - 5.1.17-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild