diff options
| author | Remi Collet <fedora@famillecollet.com> | 2014-08-25 21:59:14 +0200 |
|---|---|---|
| committer | Remi Collet <fedora@famillecollet.com> | 2014-08-25 21:59:14 +0200 |
| commit | 048d8d24b33b4223cdbf8f28054f39e7e35eebde (patch) | |
| tree | 5dc6d636322045e09b5179f78ddb36e25cd0b81f | |
| parent | 8411ef009a7acbbdcec38709510fe8029b45614f (diff) | |
php-pecl-* improve SCL build for 5.6 (wip)
| -rw-r--r-- | php-pecl-sphinx.spec | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/php-pecl-sphinx.spec b/php-pecl-sphinx.spec index c57f175..c78bce4 100644 --- a/php-pecl-sphinx.spec +++ b/php-pecl-sphinx.spec @@ -23,7 +23,7 @@ Name: %{?scl_prefix}php-pecl-sphinx Version: 1.3.2 -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;')} Summary: PECL extension for Sphinx SQL full-text search engine Group: Development/Languages License: PHP @@ -45,18 +45,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: 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 @@ -178,6 +179,9 @@ fi %changelog +* Mon Aug 25 2014 Remi Collet <rcollet@redhat.com> - 1.3.2-2 +- improve SCL build + * Tue May 06 2014 Remi Collet <remi@fedoraproject.org> - 1.3.2-1 - Update to 1.3.2 (stable) |