diff options
| author | Remi Collet <fedora@famillecollet.com> | 2014-08-26 10:54:59 +0200 |
|---|---|---|
| committer | Remi Collet <fedora@famillecollet.com> | 2014-08-26 10:54:59 +0200 |
| commit | 222a96383e1b13895fa95ac896e2c4fa11db03bd (patch) | |
| tree | 07ddbb5f67cf46d62f2eb562af6192e4fc2c188e | |
| parent | 316f490fb6fb836c7a0dc255f904ee6632012544 (diff) | |
php-pecl-* improve SCL build for 5.6 (done)
| -rw-r--r-- | php-pecl-sync.spec | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/php-pecl-sync.spec b/php-pecl-sync.spec index 734dc16..0ada4ac 100644 --- a/php-pecl-sync.spec +++ b/php-pecl-sync.spec @@ -22,7 +22,7 @@ Summary: Named and unnamed synchronization objects Name: %{?scl_prefix}php-pecl-%{pecl_name} Version: 1.0.1 -Release: 1%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} +Release: 2%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} License: MIT Group: Development/Languages URL: http://pecl.php.net/package/%{pecl_name} @@ -42,19 +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: php54w-pecl-%{pecl_name} +Obsoletes: php53-pecl-%{pecl_name} <= %{version} +Obsoletes: php53u-pecl-%{pecl_name} <= %{version} +Obsoletes: php54-pecl-%{pecl_name} <= %{version} +Obsoletes: php54w-pecl-%{pecl_name} <= %{version} %if "%{php_version}" > "5.5" -Obsoletes: php55u-pecl-%{pecl_name} -Obsoletes: php55w-pecl-%{pecl_name} +Obsoletes: php55u-pecl-%{pecl_name} <= %{version} +Obsoletes: php55w-pecl-%{pecl_name} <= %{version} %endif %if "%{php_version}" > "5.6" -Obsoletes: php56u-pecl-%{pecl_name} -Obsoletes: php56w-pecl-%{pecl_name} +Obsoletes: php56u-pecl-%{pecl_name} <= %{version} +Obsoletes: php56w-pecl-%{pecl_name} <= %{version} %endif %endif @@ -199,6 +199,9 @@ rm -rf %{buildroot} %changelog +* Tue Aug 26 2014 Remi Collet <rcollet@redhat.com> - 1.0.1-2 +- improve SCL build + * Fri Jul 25 2014 Remi Collet <remi@fedoraproject.org> - 1.0.1-1 - Update to 1.0.1 (stable) |