From d4bca5573153ea4c0fabde7937e4c076cb6edea5 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 10 Jun 2021 07:40:19 +0200 Subject: temporarily ignore 3 tests with PHP 8.1 --- php-pecl-apcu.spec | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/php-pecl-apcu.spec b/php-pecl-apcu.spec index e2cd9d4..e2a494b 100644 --- a/php-pecl-apcu.spec +++ b/php-pecl-apcu.spec @@ -36,7 +36,7 @@ URL: https://pecl.php.net/package/APCu Release: 0.8.%{gh_date}git%{gh_short}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{pecl_name}-%{version}-%{gh_short}.tar.gz %else -Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} Source0: https://pecl.php.net/get/%{pecl_name}-%{version}.tgz %endif Source1: %{pecl_name}-5.1.19.ini @@ -45,7 +45,7 @@ Source3: %{pecl_name}.conf.php BuildRequires: make BuildRequires: %{?dtsprefix}gcc -BuildRequires: %{?scl_prefix}php-devel > 7 +BuildRequires: %{?scl_prefix}php-devel >= 7.0 BuildRequires: %{?scl_prefix}php-pear Requires: %{?scl_prefix}php(zend-abi) = %{php_zend_api} @@ -93,6 +93,9 @@ Obsoletes: php74w-pecl-%{pecl_name} <= %{version} %if "%{php_version}" > "8.0" Obsoletes: php80-pecl-%{pecl_name} <= %{version} %endif +%if "%{php_version}" > "8.1" +Obsoletes: php81-pecl-%{pecl_name} <= %{version} +%endif %endif @@ -238,6 +241,12 @@ done %check +%if "%{php_version}" > "8.1" +rm ?TS/tests/apc_003b.phpt +rm ?TS/tests/apc_006_php73.phpt +rm ?TS/tests/bug76145.phpt +%endif + cd NTS %{_bindir}/php -n \ -d extension=%{buildroot}%{php_extdir}/%{pecl_name}.so \ @@ -319,6 +328,9 @@ fi %changelog +* Thu Jun 10 2021 Remi Collet - 5.1.20-2 +- temporarily ignore 3 tests with PHP 8.1 + * Thu Mar 4 2021 Remi Collet - 5.1.20-1 - update to 5.1.20 -- cgit