From 77fe47ade536e1b4d0511c380a09861425b4d56d Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 25 Aug 2014 08:07:11 +0200 Subject: php-pecl-* improve SCL build for 5.6 (wip) --- php-pecl-amqp.spec | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/php-pecl-amqp.spec b/php-pecl-amqp.spec index e179248..792b2b0 100644 --- a/php-pecl-amqp.spec +++ b/php-pecl-amqp.spec @@ -24,7 +24,7 @@ Summary: Communicate with any AMQP compliant server Name: %{?scl_prefix}php-pecl-amqp Version: 1.4.0 -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: PHP Group: Development/Languages URL: http://pecl.php.net/package/amqp @@ -48,16 +48,19 @@ 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 "%{?vendor}" == "Remi Collet" +%if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1} # Other third party repo stuff Obsoletes: php53-pecl-%{pecl_name} -Obsoletes: php53u-pecl-%{pecl_name} +Obsoletes: php53w-pecl-%{pecl_name} Obsoletes: php54-pecl-%{pecl_name} +Obsoletes: php54w-pecl-%{pecl_name} %if "%{php_version}" > "5.5" Obsoletes: php55u-pecl-%{pecl_name} +Obsoletes: php55w-pecl-%{pecl_name} %endif %if "%{php_version}" > "5.6" Obsoletes: php56u-pecl-%{pecl_name} +Obsoletes: php56w-pecl-%{pecl_name} %endif %endif @@ -253,6 +256,9 @@ fi %changelog +* Mon Aug 25 2014 Remi Collet - 1.4.0-1 +- improve SCL build + * Tue Apr 15 2014 Remi Collet - 1.4.0-1 - update to 1.6.0 (stable) -- cgit