diff options
| author | Remi Collet <fedora@famillecollet.com> | 2014-08-26 10:06:01 +0200 |
|---|---|---|
| committer | Remi Collet <fedora@famillecollet.com> | 2014-08-26 10:06:01 +0200 |
| commit | 0d64f59763d550e28aec1d28b5a26887e140d0a3 (patch) | |
| tree | e926e2eb400a6dc1bd1834c9b2ab1c6cea00db8f | |
| parent | 61edb9167bce5cf0a9760c1ba5fef3e1c356342d (diff) | |
php-pecl-* improve SCL build for 5.6 (wip)
| -rw-r--r-- | php-pecl-jsond.spec | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/php-pecl-jsond.spec b/php-pecl-jsond.spec index 14f6a3f..299b77f 100644 --- a/php-pecl-jsond.spec +++ b/php-pecl-jsond.spec @@ -23,7 +23,7 @@ Summary: JavaScript Object Notation Name: %{?scl_prefix}php-pecl-%{pecl_name} Version: 1.3.0 -Release: 2%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} +Release: 3%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} License: PHP Group: Development/Languages URL: http://pecl.php.net/package/%{pecl_name} @@ -43,16 +43,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 @@ -215,6 +218,9 @@ rm -rf %{buildroot} %changelog +* Tue Aug 26 2014 Remi Collet <rcollet@redhat.com> - 1.3.0-3 +- improve SCL build + * Wed Apr 16 2014 Remi Collet <remi@fedoraproject.org> - 1.3.0-2 - add numerical prefix to extension configuration file |