From 4bcaa5b3354791587cdc8b0bd2ec67c74b02cc1b Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 5 Aug 2022 09:33:25 +0200 Subject: cleanup --- php-pecl-excimer.spec | 30 +++++++++++------------------- 1 file changed, 11 insertions(+), 19 deletions(-) diff --git a/php-pecl-excimer.spec b/php-pecl-excimer.spec index 12b916a..424d141 100644 --- a/php-pecl-excimer.spec +++ b/php-pecl-excimer.spec @@ -7,21 +7,22 @@ # Please, preserve the changelog entries # %if 0%{?scl:1} -%global sub_prefix %{scl_prefix} %scl_package php-pecl-excimer %else %global _root_prefix %{_prefix} %endif +%bcond_without tests + %global pecl_name excimer %global ini_name 40-%{pecl_name}.ini # segfault in test suite %global with_zts 0%{!?_without_zts:%{?__ztsphp:1}} Summary: Interrupting timer and low-overhead sampling profiler -Name: %{?sub_prefix}php-pecl-%{pecl_name} +Name: %{?scl_prefix}php-pecl-%{pecl_name} Version: 1.0.4 -Release: 1%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} +Release: 2%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} License: ASL 2.0 URL: https://pecl.php.net/package/%{pecl_name} Source0: https://pecl.php.net/get/%{pecl_name}-%{version}.tgz @@ -40,22 +41,6 @@ Provides: %{?scl_prefix}php-%{pecl_name}%{?_isa} = %{version} Provides: %{?scl_prefix}php-pecl(%{pecl_name}) = %{version} Provides: %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa} = %{version} -%if "%{?packager}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel} -# Other third party repo stuff -%if "%{php_version}" > "7.3" -Obsoletes: php73-pecl-%{pecl_name} -%endif -%if "%{php_version}" > "7.4" -Obsoletes: php74-pecl-%{pecl_name} -%endif -%if "%{php_version}" > "8.0" -Obsoletes: php80-pecl-%{pecl_name} -%endif -%if "%{php_version}" > "8.1" -Obsoletes: php81-pecl-%{pecl_name} -%endif -%endif - %description Calls a user-defined callback when a one-shot or periodic timer expires. @@ -175,9 +160,11 @@ cd NTS --define extension=%{buildroot}/%{php_extdir}/%{pecl_name}.so \ --modules | grep '^%{pecl_name}$' +%if %{with tests} # Upstream test suite for NTS extension TEST_PHP_ARGS="-n -d extension=%{buildroot}/%{php_extdir}/%{pecl_name}.so" \ %{__php} -n run-tests.php $OPT +%endif %if %{with_zts} cd ../ZTS @@ -186,10 +173,12 @@ cd ../ZTS --define extension=%{buildroot}/%{php_ztsextdir}/%{pecl_name}.so \ --modules | grep '^%{pecl_name}$' +%if %{with tests} # Upstream test suite for ZTS extension TEST_PHP_ARGS="-n -d extension=%{buildroot}/%{php_ztsextdir}/%{pecl_name}.so" \ %{__ztsphp} -n run-tests.php $OPT %endif +%endif %files @@ -207,6 +196,9 @@ TEST_PHP_ARGS="-n -d extension=%{buildroot}/%{php_ztsextdir}/%{pecl_name}.so" \ %changelog +* Fri Aug 5 2022 Remi Collet - 1.0.4-2 +- cleanup + * Mon May 9 2022 Remi Collet - 1.0.4-1 - update to 1.0.4 - drop patch merged upstream -- cgit