summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2014-08-26 08:36:36 +0200
committerRemi Collet <fedora@famillecollet.com>2014-08-26 08:36:36 +0200
commita146153514d251845dc8229d498e1ebc6605a765 (patch)
treedc48c0d6c28b92be204ef5bd8965f0c216d77dbb
parent77db42ee020ae326b58a57946adc271a672c917b (diff)
php-pecl-* improve SCL build for 5.6 (wip)
-rw-r--r--php-pecl-crypto.spec10
1 files changed, 8 insertions, 2 deletions
diff --git a/php-pecl-crypto.spec b/php-pecl-crypto.spec
index c952272..dfb451b 100644
--- a/php-pecl-crypto.spec
+++ b/php-pecl-crypto.spec
@@ -23,7 +23,7 @@
Summary: Wrapper for OpenSSL Crypto Library
Name: %{?scl_prefix}php-pecl-%{pecl_name}
Version: 0.1.1
-Release: 2%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
+Release: 3%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
License: BSD
Group: Development/Languages
URL: http://pecl.php.net/package/%{pecl_name}
@@ -48,16 +48,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
@@ -205,6 +208,9 @@ rm -rf %{buildroot}
%changelog
+* Tue Aug 26 2014 Remi Collet <rcollet@redhat.com> - 0.1.1-3
+- improve SCL build
+
* Tue Apr 15 2014 Remi Collet <remi@fedoraproject.org> - 0.1.1-2
- add numerical prefix to extension configuration file