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 | 493c3cbf2e1426cf73a0b20a08ab8bc598c8a819 (patch) | |
| tree | 148311b73aa4825fdc84aa58777013aa9d72ca8c | |
| parent | 255a89f42cc6e71bf60443f2f730b71ac8a40907 (diff) | |
php-pecl-* improve SCL build for 5.6 (done)
| -rw-r--r-- | php-pecl-xattr.spec | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/php-pecl-xattr.spec b/php-pecl-xattr.spec index c577f05..24b154d 100644 --- a/php-pecl-xattr.spec +++ b/php-pecl-xattr.spec @@ -22,7 +22,7 @@ Summary: Extended attributes Name: %{?scl_prefix}php-pecl-%{pecl_name} Version: 1.2.0 -Release: 4%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} +Release: 5%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} License: PHP Group: Development/Languages URL: http://pecl.php.net/package/%{pecl_name} @@ -47,18 +47,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 -%if "%{php_version}" > "5.4" -Obsoletes: php53-pecl-%{pecl_name} -Obsoletes: php53u-pecl-%{pecl_name} -Obsoletes: php54-pecl-%{pecl_name} -%endif +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: php55u-pecl-%{pecl_name} <= %{version} +Obsoletes: php55w-pecl-%{pecl_name} <= %{version} %endif %if "%{php_version}" > "5.6" -Obsoletes: php56u-pecl-%{pecl_name} +Obsoletes: php56u-pecl-%{pecl_name} <= %{version} +Obsoletes: php56w-pecl-%{pecl_name} <= %{version} %endif %endif @@ -193,6 +194,9 @@ rm -rf %{buildroot} %changelog +* Tue Aug 26 2014 Remi Collet <rcollet@redhat.com> - 1.2.0-5 +- improve SCL build + * Thu Apr 17 2014 Remi Collet <remi@fedoraproject.org> - 1.2.0-4 - add numerical prefix to extension configuration file (php 5.6) |