From 4fe2bd1c9cc3e0e88d72686ff8b8c25881edc0da Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 26 Aug 2014 10:06:01 +0200 Subject: php-pecl-* improve SCL build for 5.6 (wip) --- php-pecl-lua.spec | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/php-pecl-lua.spec b/php-pecl-lua.spec index 497a830..457679e 100644 --- a/php-pecl-lua.spec +++ b/php-pecl-lua.spec @@ -23,7 +23,7 @@ Summary: Embedded lua interpreter Name: %{?scl_prefix}php-pecl-%{pecl_name} Version: 1.1.0 -Release: 4%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} +Release: 5%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} License: PHP Group: Development/Languages URL: http://pecl.php.net/package/%{pecl_name} @@ -50,15 +50,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 0%{!?scl:1} +%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: php53-pecl-%{pecl_name} +Obsoletes: php53u-pecl-%{pecl_name} +Obsoletes: php54-pecl-%{pecl_name} +Obsoletes: php54w-pecl-%{pecl_name} %if "%{php_version}" > "5.5" -Obsoletes: php55u-pecl-%{pecl_name} +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 @@ -215,6 +219,9 @@ rm -rf %{buildroot} %changelog +* Tue Aug 26 2014 Remi Collet - 1.1.0-5 +- improve SCL build + * Wed Apr 16 2014 Remi Collet - 1.1.0-4 - add numerical prefix to extension configuration file -- cgit