From e9ad5b47096e5c86a3e0ffc63c30bc6a35d8783b Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 5 Jul 2024 11:17:45 +0200 Subject: skip 1 test with 8.4 --- php-pecl-apcu.spec | 67 ++++++++++-------------------------------------------- 1 file changed, 12 insertions(+), 55 deletions(-) (limited to 'php-pecl-apcu.spec') diff --git a/php-pecl-apcu.spec b/php-pecl-apcu.spec index 1791d39..d62c7d2 100644 --- a/php-pecl-apcu.spec +++ b/php-pecl-apcu.spec @@ -3,7 +3,7 @@ # # Fedora spec file for php-pecl-apcu # -# Copyright (c) 2013-2023 Remi Collet +# Copyright (c) 2013-2024 Remi Collet # License: CC-BY-SA-4.0 # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -32,7 +32,7 @@ Summary: APC User Cache Version: 5.1.23 License: PHP-3.01 URL: https://pecl.php.net/package/APCu -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 Source1: %{pecl_name}-5.1.19.ini Source2: %{pecl_name}-panel.conf @@ -52,36 +52,6 @@ Provides: %{?scl_prefix}php-apcu%{?_isa} = %{version} Provides: %{?scl_prefix}php-pecl(apcu) = %{version} Provides: %{?scl_prefix}php-pecl(apcu)%{?_isa} = %{version} -%if "%{?packager}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel} -# Other third party repo stuff -Obsoletes: php53-pecl-%{pecl_name} <= %{version} -Obsoletes: php53u-pecl-%{pecl_name} <= %{version} -Obsoletes: php54-pecl-%{pecl_name} <= %{version} -Obsoletes: php54w-pecl-%{pecl_name} <= %{version} -Obsoletes: php55u-pecl-%{pecl_name} <= %{version} -Obsoletes: php55w-pecl-%{pecl_name} <= %{version} -Obsoletes: php56u-pecl-%{pecl_name} <= %{version} -Obsoletes: php56w-pecl-%{pecl_name} <= %{version} -Obsoletes: php70u-pecl-%{pecl_name} <= %{version} -Obsoletes: php70w-pecl-%{pecl_name} <= %{version} -%if "%{php_version}" > "7.1" -Obsoletes: php71u-pecl-%{pecl_name} <= %{version} -Obsoletes: php71w-pecl-%{pecl_name} <= %{version} -%endif -%if "%{php_version}" > "7.2" -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: php73w-pecl-%{pecl_name} <= %{version} -%endif -%if "%{php_version}" > "7.4" -Obsoletes: php74-pecl-%{pecl_name} <= %{version} -Obsoletes: php74w-pecl-%{pecl_name} <= %{version} -%endif -%endif - %description APCu is userland caching: APC stripped of opcode caching. @@ -217,9 +187,13 @@ done %check cd %{sources} +if [ $(%{__php} -r 'echo PHP_VERSION_ID;') -ge 80400 ]; then + rm tests/apc_entry_002.phpt +fi + %{_bindir}/php -n \ -d extension=%{buildroot}%{php_extdir}/%{pecl_name}.so \ - -m | grep 'apcu' + -m | grep '^apcu$' %if %{with tests} # Upstream test suite for NTS extension @@ -232,7 +206,7 @@ REPORT_EXIT_STATUS=1 \ %if %{with_zts} %{__ztsphp} -n \ -d extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so \ - -m | grep 'apcu' + -m | grep '^apcu$' %if %{with tests} # Upstream test suite for ZTS extension @@ -244,28 +218,8 @@ REPORT_EXIT_STATUS=1 \ %endif -%if 0%{?fedora} < 24 && 0%{?rhel} < 8 -# when pear installed alone, after us -%triggerin -- %{?scl_prefix}php-pear -if [ -x %{__pecl} ] ; then - %{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || : -fi - -# posttrans as pear can be installed after us -%posttrans -if [ -x %{__pecl} ] ; then - %{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || : -fi - -%postun -if [ $1 -eq 0 -a -x %{__pecl} ] ; then - %{pecl_uninstall} %{pecl_name} >/dev/null || : -fi -%endif - - %files -%{?_licensedir:%license %{sources}/LICENSE} +%license %{sources}/LICENSE %doc %{pecl_docdir}/%{pecl_name} %{pecl_xmldir}/%{name}.xml @@ -298,6 +252,9 @@ fi %changelog +* Thu Jul 4 2024 Remi Collet - 5.1.23-2 +- skip 1 test with 8.4 + * Sun Nov 12 2023 Remi Collet - 5.1.23-1 - update to 5.1.23 -- cgit