From 72e609d2b2d85439e6ebf7fc1c3fb7d2a04dab5c Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 14 May 2014 10:00:37 +0200 Subject: php-pecl-http: obsoletes php-pecl-http1 (php 5.6) --- php-pecl-http.spec | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'php-pecl-http.spec') diff --git a/php-pecl-http.spec b/php-pecl-http.spec index 3030355..56ccfbe 100644 --- a/php-pecl-http.spec +++ b/php-pecl-http.spec @@ -27,7 +27,7 @@ Name: %{?scl_prefix}php-pecl-http Version: 2.0.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;')} Summary: Extended HTTP support License: BSD @@ -87,8 +87,13 @@ Requires: %{?scl_prefix}php-spl%{?_isa} %endif Requires: %{?scl_prefix}php-pecl(propro)%{?_isa} Requires: %{?scl_prefix}php-pecl(raphf)%{?_isa} +%if "%{php_version}" > "5.6" +# V1 don't support PHP 5.6 https://bugs.php.net/66879 +Obsoletes: %{?scl_prefix}php-pecl-http1 < 2 +%else # Can't install both versions of the same extension Conflicts: %{?scl_prefix}php-pecl-http1 +%endif Provides: %{?scl_prefix}php-pecl(%{proj_name}) = %{version}%{?prever} Provides: %{?scl_prefix}php-pecl(%{proj_name})%{?_isa} = %{version}%{?prever} @@ -279,6 +284,9 @@ rm -rf %{buildroot} %changelog +* Wed May 14 2014 Remi Collet - 2.0.6-2 +- php56: obsoletes php-pecl-http1 + * Thu Apr 24 2014 Remi Collet - 2.0.6-1 - Update to 2.0.6 -- cgit