From dcc87271eab690748c8142b311533f9c959c08f2 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 25 Aug 2014 10:57:04 +0200 Subject: php-pecl-* improve SCL build for 5.6 (wip) --- php-pecl-judy.spec | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/php-pecl-judy.spec b/php-pecl-judy.spec index ce9299c..c925c1d 100644 --- a/php-pecl-judy.spec +++ b/php-pecl-judy.spec @@ -24,7 +24,7 @@ Summary: PHP Judy implements sparse dynamic arrays Name: %{?scl_prefix}php-pecl-judy Version: 1.0.2 -Release: 2%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} +Release: 3%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} License: PHP Group: Development/Languages URL: http://pecl.php.net/package/%{pecl_name} @@ -57,18 +57,19 @@ Provides: %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa} = %{version} Obsoletes: %{?scl_prefix}php-pecl-Judy < 1.0.1 Provides: %{?scl_prefix}php-pecl-Judy = %{version}-%{release} -%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 @@ -242,6 +243,9 @@ rm -rf %{buildroot} %changelog +* Mon Aug 25 2014 Remi Collet - 1.0.2-3 +- improve SCL build + * Wed Apr 16 2014 Remi Collet - 1.0.2-2 - use %%{ini_name} macro - add numerical prefix to extension configuration file -- cgit