summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2014-08-26 10:54:59 +0200
committerRemi Collet <fedora@famillecollet.com>2014-08-26 10:54:59 +0200
commit5be72098193ec1ed3b5910002fd8696cb914a0d0 (patch)
treec8a2f8e9c982690c7594e4bd28f3c7088e3b36d1
parentbffe38cdf52127a653f8d5b6ee70144e07090c74 (diff)
php-pecl-* improve SCL build for 5.6 (done)
-rw-r--r--php-pecl-uopz.spec20
1 files changed, 13 insertions, 7 deletions
diff --git a/php-pecl-uopz.spec b/php-pecl-uopz.spec
index 674777b..9af9f7f 100644
--- a/php-pecl-uopz.spec
+++ b/php-pecl-uopz.spec
@@ -24,7 +24,7 @@
Summary: User Operations for Zend
Name: %{?scl_prefix}php-pecl-%{pecl_name}
Version: 2.0.5
-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: PHP
Group: Development/Languages
URL: http://pecl.php.net/package/%{pecl_name}
@@ -44,16 +44,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: php53-pecl-%{pecl_name} <= %{version}
+Obsoletes: php53u-pecl-%{pecl_name} <= %{version}
+Obsoletes: php54-pecl-%{pecl_name} <= %{version}
+Obsoletes: php54w-pecl-%{pecl_name} <= %{version}
%if "%{php_version}" > "5.5"
-Obsoletes: php55u-pecl-%{pecl_name}
+Obsoletes: php55u-pecl-%{pecl_name} <= %{version}
+Obsoletes: php55w-pecl-%{pecl_name} <= %{version}
%endif
%if "%{php_version}" > "5.6"
-Obsoletes: php56u-pecl-%{pecl_name}
+Obsoletes: php56u-pecl-%{pecl_name} <= %{version}
+Obsoletes: php56w-pecl-%{pecl_name} <= %{version}
%endif
%endif
@@ -238,6 +241,9 @@ rm -rf %{buildroot}
# add date time as upstream used to release various
# archives using the same version :(
%changelog
+* Tue Aug 26 2014 Remi Collet <rcollet@redhat.com> - 2.0.5-2
+- improve SCL build
+
* Thu Jun 05 2014 Remi Collet <remi@fedoraproject.org> - 2.0.5-1
- Update to 2.0.5 (stable)