From 398e6c59df5c2b23d7faa8f173f3f4f187f25780 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 26 Aug 2014 08:36:36 +0200 Subject: php-pecl-* improve SCL build for 5.6 (wip) --- php-pecl-doublemetaphone.spec | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/php-pecl-doublemetaphone.spec b/php-pecl-doublemetaphone.spec index f83346e..adbb51c 100644 --- a/php-pecl-doublemetaphone.spec +++ b/php-pecl-doublemetaphone.spec @@ -22,7 +22,7 @@ Summary: Provide Double Metaphone functionality Name: %{?scl_prefix}php-pecl-%{pecl_name} Version: 1.0.1 -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/%{pecl_name} @@ -42,18 +42,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 -%if "%{php_version}" > "5.4" Obsoletes: php53-pecl-%{pecl_name} Obsoletes: php53u-pecl-%{pecl_name} Obsoletes: php54-pecl-%{pecl_name} -%endif +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 @@ -198,5 +199,8 @@ rm -rf %{buildroot} %changelog +* Tue Aug 26 2014 Remi Collet - 1.0.1-2 +- improve SCL build + * Wed May 7 2014 Remi Collet - 1.0.1-1 - initial package, version 1.0.1 (stable) \ No newline at end of file -- cgit