summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2014-08-25 08:07:11 +0200
committerRemi Collet <fedora@famillecollet.com>2014-08-25 08:07:11 +0200
commitab490d2a57c54f954a0c68156642ddc53d59d329 (patch)
tree4da51e5cc7ac3db4f24f717e70067cc540bf8fd8
parent872cca4b4fab90a5b0832165d170dc2cd4e584c0 (diff)
php-pecl-* improve SCL build for 5.6 (wip)
-rw-r--r--php-pecl-gearman.spec10
1 files changed, 8 insertions, 2 deletions
diff --git a/php-pecl-gearman.spec b/php-pecl-gearman.spec
index a06c0bf..64207ee 100644
--- a/php-pecl-gearman.spec
+++ b/php-pecl-gearman.spec
@@ -37,7 +37,7 @@
Name: %{?scl_prefix}php-pecl-gearman
Version: %{extver}
-Release: 4%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
+Release: 5%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
Summary: PHP wrapper to libgearman
Group: Development/Tools
@@ -63,16 +63,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
@@ -193,6 +196,9 @@ fi
%changelog
+* Mon Aug 25 2014 Remi Collet <rcollet@redhat.com> - 1.1.2-5
+- improve SCL build
+
* Wed Apr 9 2014 Remi Collet <remi@fedoraproject.org> - 1.1.2-4
- add numerical prefix to extension configuration file