summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2014-08-26 10:06:01 +0200
committerRemi Collet <fedora@famillecollet.com>2014-08-26 10:06:01 +0200
commit1e9250cb3e92244be8b6a1a1fb35e96583a486e7 (patch)
tree07fabef0be9f917f843304a97b3afbfcd9737fb1
parentfb507825af4f87fdcfd0742d43cae6d315b90bee (diff)
php-pecl-* improve SCL build for 5.6 (wip)
-rw-r--r--php-pecl-protocolbuffers.spec15
1 files changed, 11 insertions, 4 deletions
diff --git a/php-pecl-protocolbuffers.spec b/php-pecl-protocolbuffers.spec
index 6026a38..ca5237d 100644
--- a/php-pecl-protocolbuffers.spec
+++ b/php-pecl-protocolbuffers.spec
@@ -22,7 +22,7 @@
Summary: Protocol buffers in PHP
Name: %{?scl_prefix}php-pecl-%{pecl_name}
Version: 0.2.6
-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}
@@ -42,15 +42,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
-%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
@@ -203,6 +207,9 @@ rm -rf %{buildroot}
%changelog
+* Tue Aug 26 2014 Remi Collet <rcollet@redhat.com> - 0.2.6-2
+- improve SCL build
+
* Tue Apr 15 2014 Remi Collet <remi@fedoraproject.org> - 0.2.6-1
- Update to 0.2.6 (alpha)