diff options
author | Remi Collet <fedora@famillecollet.com> | 2014-08-26 08:36:36 +0200 |
---|---|---|
committer | Remi Collet <fedora@famillecollet.com> | 2014-08-26 08:36:36 +0200 |
commit | 76ce69c137ff85750be3993c4bcc2b44a1dcb444 (patch) | |
tree | 83c26809348344541a5778655610fbcc864a478b | |
parent | c8693bffc1bc3e0d7f48c774ef9d6f37cf8580c9 (diff) |
php-pecl-* improve SCL build for 5.6 (wip)
-rw-r--r-- | php-pecl-hrtime.spec | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/php-pecl-hrtime.spec b/php-pecl-hrtime.spec index cedfe11..5849b9c 100644 --- a/php-pecl-hrtime.spec +++ b/php-pecl-hrtime.spec @@ -22,7 +22,7 @@ Summary: High resolution timing Name: %{?scl_prefix}php-pecl-%{pecl_name} Version: 0.4.3 -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: BSD Group: Development/Languages URL: http://pecl.php.net/package/%{pecl_name} @@ -46,18 +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 -%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 @@ -208,5 +209,8 @@ rm -rf %{buildroot} %changelog +* Tue Aug 26 2014 Remi Collet <rcollet@redhat.com> - 0.4.3-2 +- improve SCL build + * Tue Apr 22 2014 Remi Collet <remi@fedoraproject.org> - 0.4.3-1 - initial package, version 0.4.3 (beta)
\ No newline at end of file |