diff options
| author | Remi Collet <fedora@famillecollet.com> | 2014-08-25 15:24:01 +0200 |
|---|---|---|
| committer | Remi Collet <fedora@famillecollet.com> | 2014-08-25 15:24:01 +0200 |
| commit | b26b41bc9cb2eaba2f74f3c34a21d09e825b112b (patch) | |
| tree | aed4f86a589071cb4e1ff0a4f01193315b7b69d0 | |
| parent | 9eab9662d288871622a0922404b93b83f6b4e5eb (diff) | |
php-pecl-* improve SCL build for 5.6 (wip)
| -rw-r--r-- | php-pecl-oauth.spec | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/php-pecl-oauth.spec b/php-pecl-oauth.spec index 810fd36..867bf67 100644 --- a/php-pecl-oauth.spec +++ b/php-pecl-oauth.spec @@ -13,7 +13,7 @@ Name: %{?scl_prefix}php-pecl-oauth Version: 1.2.3 -Release: 6%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} +Release: 7%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} Summary: PHP OAuth consumer extension Group: Development/Languages License: BSD @@ -37,16 +37,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 @@ -164,6 +167,9 @@ fi %changelog +* Mon Aug 25 2014 Remi Collet <rcollet@redhat.com> - 1.2.3-7 +- improve SCL build + * Wed Apr 16 2014 Remi Collet <remi@fedoraproject.org> - 1.2.3-6 - add numerical prefix to extension configuration file (php 5.6) |