From 790d523677e2d2b164f8c4a11d92f7693e613715 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-inotify.spec | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/php-pecl-inotify.spec b/php-pecl-inotify.spec index 3d83f56..3067485 100644 --- a/php-pecl-inotify.spec +++ b/php-pecl-inotify.spec @@ -22,7 +22,7 @@ Summary: Inotify Name: %{?scl_prefix}php-pecl-%{pecl_name} Version: 0.1.6 -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} @@ -42,16 +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 -Obsoletes: php53-pecl-%{pecl_name} -Obsoletes: php53u-pecl-%{pecl_name} -Obsoletes: php54-pecl-%{pecl_name} +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: php56u-pecl-%{pecl_name} +Obsoletes: php56w-pecl-%{pecl_name} %endif %endif @@ -206,6 +209,9 @@ rm -rf %{buildroot} %changelog +* Tue Aug 26 2014 Remi Collet - 0.1.6-5 +- improve SCL build + * Wed Apr 16 2014 Remi Collet - 0.1.6-4 - add numerical prefix to extension configuration file -- cgit