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
commit6f91394055e7eea0c13475f5f41558467138796f (patch)
tree489a217f4f70f15e1aa7ee8355beb14ca218892b
parentdc4cab2b07879478af226fa5c28d4e042e0be970 (diff)
php-pecl-* improve SCL build for 5.6 (wip)
-rw-r--r--php-pecl-blenc.spec10
1 files changed, 8 insertions, 2 deletions
diff --git a/php-pecl-blenc.spec b/php-pecl-blenc.spec
index 564d7fe..400bb3a 100644
--- a/php-pecl-blenc.spec
+++ b/php-pecl-blenc.spec
@@ -25,7 +25,7 @@
Summary: BLowfish ENCryption for PHP Scripts
Name: %{?scl_prefix}php-pecl-%{pecl_name}
Version: 1.1.4
-Release: 0.1.%{prever}%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
+Release: 0.2.%{prever}%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
# blenc is PHP, bf_algo.c is LGPL
License: PHP and LGPL
@@ -52,16 +52,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
@@ -244,5 +247,8 @@ rm -rf %{buildroot}
%changelog
+* Tue Aug 26 2014 Remi Collet <rcollet@redhat.com> - 1.1.4-0.2.b
+- improve SCL build
+
* Mon Apr 28 2014 Remi Collet <remi@fedoraproject.org> - 1.1.4-0.1.b
- initial package, version 1.1.4b (beta) \ No newline at end of file