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 | b67829836f2c395a40e29167d0fcb2684a1c5029 (patch) | |
| tree | 6d0339202107e0c519162f2d6089d51bb490bae6 | |
| parent | 987d11797a50040576f2907a606932d1672e156c (diff) | |
php-pecl-* improve SCL build for 5.6 (wip)
| -rw-r--r-- | php-pecl-scrypt.spec | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/php-pecl-scrypt.spec b/php-pecl-scrypt.spec index b668a34..594d695 100644 --- a/php-pecl-scrypt.spec +++ b/php-pecl-scrypt.spec @@ -22,7 +22,7 @@ Summary: Scrypt hashing function Name: %{?scl_prefix}php-pecl-%{pecl_name} Version: 1.2 -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: BSD Group: Development/Languages URL: http://pecl.php.net/package/%{pecl_name} @@ -52,16 +52,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: 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 @@ -214,6 +217,9 @@ rm -rf %{buildroot} %changelog +* Tue Aug 26 2014 Remi Collet <rcollet@redhat.com> - 1.2-5 +- improve SCL build + * Wed Apr 16 2014 Remi Collet <remi@fedoraproject.org> - 1.2-4 - add numerical prefix to extension configuration file (php 5.6) |