diff options
| author | Remi Collet <fedora@famillecollet.com> | 2014-08-25 10:57:04 +0200 |
|---|---|---|
| committer | Remi Collet <fedora@famillecollet.com> | 2014-08-25 10:57:04 +0200 |
| commit | 84db27794e8f08c4fb418601f5c1d41b2a66321f (patch) | |
| tree | ae4f3d7907ff50d930fe2fd3a9f24d650c3938be | |
| parent | 595f1cf5b821f8a49808d08b47421ff8b0630037 (diff) | |
php-pecl-* improve SCL build for 5.6 (wip)
| -rw-r--r-- | php-pecl-geoip.spec | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/php-pecl-geoip.spec b/php-pecl-geoip.spec index b8b2068..c942b7d 100644 --- a/php-pecl-geoip.spec +++ b/php-pecl-geoip.spec @@ -14,7 +14,7 @@ Name: %{?scl_prefix}php-pecl-geoip Version: 1.1.0 -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: Extension to map IP addresses to geographic places Group: Development/Languages License: PHP @@ -39,18 +39,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 0%{!?scl:1} +%if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1} # Other third party repo stuff Obsoletes: php53-pecl-%{pecl_name} Obsoletes: php53u-pecl-%{pecl_name} -%if "%{php_version}" > "5.4" 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 @@ -182,6 +183,9 @@ fi %changelog +* Mon Aug 25 2014 Remi Collet <rcollet@redhat.com> - 1.1.0-2 +- improve SCL build + * Sat May 03 2014 Remi Collet <remi@fedoraproject.org> - 1.1.0-1 - Update to 1.1.0 (beta) - upstream patch for old auto* version (rhel <= 6) |