diff options
| author | Remi Collet <fedora@famillecollet.com> | 2014-08-25 08:07:11 +0200 |
|---|---|---|
| committer | Remi Collet <fedora@famillecollet.com> | 2014-08-25 08:07:11 +0200 |
| commit | bb7f1cbbf87f641c4452433dde86871ad7753868 (patch) | |
| tree | 4851cf990b7e3e370d4613323d8cefba0f1e707f | |
| parent | 97a3b1977b737b42755a293254699587c03c2e1b (diff) | |
php-pecl-* improve SCL build for 5.6 (wip)
| -rw-r--r-- | php-pecl-propro.spec | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/php-pecl-propro.spec b/php-pecl-propro.spec index 51637fc..a1817ce 100644 --- a/php-pecl-propro.spec +++ b/php-pecl-propro.spec @@ -23,7 +23,7 @@ Summary: Property proxy Name: %{?scl_prefix}php-pecl-%{pecl_name} Version: 1.0.0 -Release: 3%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} +Release: 4%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} License: BSD Group: Development/Languages URL: http://pecl.php.net/package/%{pecl_name} @@ -43,18 +43,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 @@ -213,6 +214,9 @@ rm -rf %{buildroot} %changelog +* Mon Aug 25 2014 Remi Collet <rcollet@redhat.com> - 1.0.0-4 +- improve SCL build + * Wed Apr 9 2014 Remi Collet <remi@fedoraproject.org> - 1.0.0-3 - add numerical prefix to extension configuration file |