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 | 7055df2d1dd233e535d5a566f9b61f8f82cac6c2 (patch) | |
| tree | 62f0106c9477d51ad534638a020bebd28a9f0d7b | |
| parent | 5b2b16eb633b26542fead4d4bcdb6b7a8c3b5dcf (diff) | |
php-pecl-* improve SCL build for 5.6 (wip)
| -rw-r--r-- | php-pecl-xmldiff.spec | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/php-pecl-xmldiff.spec b/php-pecl-xmldiff.spec index 4502566..6490929 100644 --- a/php-pecl-xmldiff.spec +++ b/php-pecl-xmldiff.spec @@ -25,7 +25,7 @@ Summary: XML diff and merge Name: %{?scl_prefix}php-pecl-%{pecl_name} Version: 0.9.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} @@ -57,16 +57,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} %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 @@ -243,6 +246,9 @@ rm -rf %{buildroot} %changelog +* Mon Aug 25 2014 Remi Collet <rcollet@redhat.com> - 0.9.2-5 +- improve SCL build + * Fri May 30 2014 Remi Collet <remi@fedoraproject.org> - 0.9.2-4 - rebuild to have NEVR > Fedora or EPEL one |