From 5c3b7329ef1ca0feecf3a90cbe7a392af0a360e1 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 25 Aug 2014 16:25:54 +0200 Subject: php-pecl-* improve SCL build for 5.6 (wip) --- php-pecl-selinux.spec | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/php-pecl-selinux.spec b/php-pecl-selinux.spec index 2c1a96e..3901146 100644 --- a/php-pecl-selinux.spec +++ b/php-pecl-selinux.spec @@ -24,7 +24,7 @@ Summary: SELinux binding for PHP scripting language Name: %{?scl_prefix}php-pecl-selinux Version: 0.3.1 -Release: 15%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} +Release: 16%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} License: PHP Group: Development/Languages URL: http://pecl.php.net/package/%{pecl_name} @@ -46,18 +46,19 @@ Provides: %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa} = %{version} Provides: %{?scl_prefix}php-%{pecl_name} = %{version} Provides: %{?scl_prefix}php-%{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 @@ -174,6 +175,9 @@ fi %changelog +* Mon Aug 25 2014 Remi Collet - 0.3.1-16 +- improve SCL build + * Wed Apr 16 2014 Remi Collet - 0.3.1-15 - add numerical prefix to extension configuration file (php 5.6) -- cgit