[php-pecl-http] obsoletes php-pecl-http1 (dropped in fedora 21)

Remi Collet remi at fedoraproject.org
Wed May 14 15:26:40 UTC 2014


commit 70ba27ae0cd066b7685e1cbd2f4da09b370c7610
Author: Remi Collet <remi at fedoraproject.org>
Date:   Wed May 14 17:26:27 2014 +0200

    obsoletes php-pecl-http1 (dropped in fedora 21)

 php-pecl-http.spec |   17 +++++++++++++++--
 1 files changed, 15 insertions(+), 2 deletions(-)
---
diff --git a/php-pecl-http.spec b/php-pecl-http.spec
index 2fbfca2..b2374ae 100644
--- a/php-pecl-http.spec
+++ b/php-pecl-http.spec
@@ -25,7 +25,7 @@
 
 Name:           php-pecl-http
 Version:        2.0.6
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Extended HTTP support
 
 License:        BSD
@@ -65,8 +65,13 @@ Requires:       php-spl%{?_isa}
 %endif
 Requires:       php-pecl(propro)%{?_isa}
 Requires:       php-pecl(raphf)%{?_isa}
-# Can't install both version of the same extension
+%if 0%{?fedora} >= 21
+# V1 don't support PHP 5.6 https://bugs.php.net/66879
+Obsoletes:      php-pecl-http1 < 2
+%else
+# Can't install both versions of the same extension
 Conflicts:      php-pecl-http1
+%endif
 
 Provides:       php-pecl(%{proj_name})         = %{version}%{?prever}
 Provides:       php-pecl(%{proj_name})%{?_isa} = %{version}%{?prever}
@@ -108,6 +113,11 @@ Summary:       Extended HTTP support developer files (header)
 Group:         Development/Libraries
 Requires:      php-pecl-http%{?_isa} = %{version}-%{release}
 Requires:      php-devel%{?_isa} >= 5.3.0
+%if 0%{?fedora} >= 21
+Obsoletes:     php-pecl-http1-devel < 2
+%else
+Conflicts:     php-pecl-http1-devel
+%endif
 
 %description devel
 These are the files needed to compile programs using HTTP extension.
@@ -236,6 +246,9 @@ fi
 
 
 %changelog
+* Wed May 14 2014 Remi Collet <remi at fedoraproject.org> - 2.0.6-2
+- obsoletes php-pecl-http1 (dropped in fedora 21)
+
 * Thu Apr 24 2014 Remi Collet <remi at fedoraproject.org> - 2.0.6-1
 - Update to 2.0.6
 


More information about the scm-commits mailing list