summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2022-09-08 14:56:00 +0200
committerRemi Collet <remi@php.net>2022-09-08 14:56:00 +0200
commit62f772af1386cf85030174303b8de7ebc976e63a (patch)
treef02e38b61ca69d523b1c22f00a2d295bf0e9389e
parentbb0248de01c4d2fe726420f8e1ea6e780e052638 (diff)
cleanup
-rw-r--r--php-pecl-zmq.spec14
1 files changed, 5 insertions, 9 deletions
diff --git a/php-pecl-zmq.spec b/php-pecl-zmq.spec
index 57539d9..e89a618 100644
--- a/php-pecl-zmq.spec
+++ b/php-pecl-zmq.spec
@@ -10,13 +10,13 @@
# Please, preserve the changelog entries
#
%if 0%{?scl:1}
-%global sub_prefix %{scl_prefix}
%scl_package php-pecl-zmq
%endif
+%bcond_without tests
+
%global with_zts 0%{!?_without_zts:%{?__ztsphp:1}}
%global pecl_name zmq
-%global with_tests 0%{!?_without_tests:1}
%if "%{php_version}" < "5.6"
%global ini_name %{pecl_name}.ini
%else
@@ -24,7 +24,7 @@
%endif
Summary: ZeroMQ messaging
-Name: %{?sub_prefix}php-pecl-%{pecl_name}
+Name: %{?scl_prefix}php-pecl-%{pecl_name}
Version: 1.1.3
Release: 16%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
License: BSD
@@ -54,10 +54,6 @@ Provides: %{?scl_prefix}php-%{pecl_name} = %{version}-99
Provides: %{?scl_prefix}php-%{pecl_name}%{?_isa} = %{version}-99
Provides: %{?scl_prefix}php-pecl(%{pecl_name}) = %{version}
Provides: %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa} = %{version}
-%if "%{?scl_prefix}" != "%{?sub_prefix}"
-Provides: %{?scl_prefix}php-pecl-%{pecl_name} = %{version}-%{release}
-Provides: %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa} = %{version}-%{release}
-%endif
%if "%{?packager}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel}
# Other third party repo stuff
@@ -203,7 +199,7 @@ cd NTS
--define extension=%{buildroot}/%{php_extdir}/%{pecl_name}.so \
--modules | grep '^%{pecl_name}$'
-%if %{with_tests}
+%if %{with tests}
: upstream test suite for NTS extension
export TEST_PHP_ARGS="-n -d extension=$PWD/modules/%{pecl_name}.so"
export REPORT_EXIT_STATUS=1
@@ -218,7 +214,7 @@ cd ../ZTS
--define extension=%{buildroot}/%{php_ztsextdir}/%{pecl_name}.so \
--modules | grep '^%{pecl_name}$'
-%if %{with_tests}
+%if %{with tests}
: upstream test suite for ZTS extension
export TEST_PHP_ARGS="-n -d extension=$PWD/modules/%{pecl_name}.so"
export TEST_PHP_EXECUTABLE=%{__ztsphp}