diff options
| -rw-r--r-- | php-pecl-yac.spec | 23 | 
1 files changed, 13 insertions, 10 deletions
diff --git a/php-pecl-yac.spec b/php-pecl-yac.spec index cd05a6c..471287a 100644 --- a/php-pecl-yac.spec +++ b/php-pecl-yac.spec @@ -23,7 +23,7 @@  Summary:        Lockless user data cache  Name:           %{?scl_prefix}php-pecl-%{pecl_name}  Version:        0.9.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:        PHP  Group:          Development/Languages @@ -46,19 +46,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 @@ -212,6 +212,9 @@ rm -rf %{buildroot}  %changelog +* Tue Aug 26 2014 Remi Collet <rcollet@redhat.com> - 0.9.1-2 +- improve SCL build +  * Fri Jul 25 2014 Remi Collet <remi@fedoraproject.org> - 0.9.1-1  - Update to 0.9.1 (beta)  | 
