From 6d24c4baaa4ab55f94d7db63c9dee48841291873 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 25 Aug 2014 08:07:11 +0200 Subject: php-pecl-* improve SCL build for 5.6 (wip) --- php-pecl-cairo.spec | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/php-pecl-cairo.spec b/php-pecl-cairo.spec index 063ef21..0233bf1 100644 --- a/php-pecl-cairo.spec +++ b/php-pecl-cairo.spec @@ -27,7 +27,7 @@ Name: %{?scl_prefix}php-pecl-cairo Version: 0.3.2 -Release: 8%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} +Release: 9%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} Summary: Cairo Graphics Library Extension Group: Development/Languages License: PHP @@ -53,16 +53,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: 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 @@ -222,6 +225,9 @@ fi %endif %changelog +* Mon Aug 25 2014 Remi Collet - 0.3.2-9 +- improve SCL build + * Tue Apr 15 2014 Remi Collet - 0.3.2-8 - add numerical prefix to extension configuration file -- cgit