From b1842512440b3d4faca0cbdfa044b9e3ef75684d Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 24 Jul 2019 09:38:06 +0200 Subject: add upstream patch for failed test with 7.4 --- php-pecl-apcu.spec | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'php-pecl-apcu.spec') diff --git a/php-pecl-apcu.spec b/php-pecl-apcu.spec index b64b8a0..78729c5 100644 --- a/php-pecl-apcu.spec +++ b/php-pecl-apcu.spec @@ -41,6 +41,8 @@ Source1: %{pecl_name}-5.1.2.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 @@ -83,11 +85,11 @@ Obsoletes: php72u-pecl-%{pecl_name} <= %{version} Obsoletes: php72w-pecl-%{pecl_name} <= %{version} %endif %if "%{php_version}" > "7.3" -Obsoletes: php73-pecl-%{pecl_name} <= %{version} +Obsoletes: php73-pecl-%{pecl_name} <= %{version} Obsoletes: php73w-pecl-%{pecl_name} <= %{version} %endif %if "%{php_version}" > "7.4" -Obsoletes: php74-pecl-%{pecl_name} <= %{version} +Obsoletes: php74-pecl-%{pecl_name} <= %{version} Obsoletes: php74w-pecl-%{pecl_name} <= %{version} %endif %endif @@ -157,6 +159,7 @@ mv %{pecl_name}-%{version} NTS %{?_licensedir: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) @@ -242,10 +245,6 @@ done %check -%if "%{php_version}" > "7.4" -rm ?TS/tests/apc_entry_003.phpt -%endif - cd NTS %{_bindir}/php -n \ -d extension=%{buildroot}%{php_extdir}/%{pecl_name}.so \ -- cgit