[php-pecl-http] update to 2.0.3 (bugfix)

Remi Collet remi at fedoraproject.org
Wed Dec 11 15:17:10 UTC 2013


commit 6d7bdd21e4bb349e543e8aa0aaa57c1ee03c2525
Author: Remi Collet <remi at fedoraproject.org>
Date:   Wed Dec 11 16:17:08 2013 +0100

    update to 2.0.3 (bugfix)

 .gitignore         |    1 +
 php-pecl-http.spec |   11 ++++++++---
 sources            |    2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e5f5e82..76b5238 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@ php-pecl-http.spec~
 /pecl_http-2.0.0beta5.tgz
 /pecl_http-2.0.0.tgz
 /pecl_http-2.0.1.tgz
+/pecl_http-2.0.3.tgz
diff --git a/php-pecl-http.spec b/php-pecl-http.spec
index 3cd41d7..4561db8 100644
--- a/php-pecl-http.spec
+++ b/php-pecl-http.spec
@@ -17,7 +17,7 @@
 %global with_zts  0%{?__ztsphp:1}
 
 Name:           php-pecl-http
-Version:        2.0.1
+Version:        2.0.3
 Release:        1%{?dist}
 Summary:        Extended HTTP support
 
@@ -58,8 +58,6 @@ Requires:       php-spl%{?_isa}
 %endif
 Requires:       php-pecl(propro)%{?_isa}
 Requires:       php-pecl(raphf)%{?_isa}
-# From code ZEND_MOD_CONFLICTS("event")
-Conflicts:      php-event
 
 Provides:       php-pecl(%{proj_name})         = %{version}%{?prever}
 Provides:       php-pecl(%{proj_name})%{?_isa} = %{version}%{?prever}
@@ -108,6 +106,9 @@ These are the files needed to compile programs using HTTP extension.
 mv %{proj_name}-%{version}%{?prever} NTS
 cd NTS
 
+# http://git.php.net/?p=pecl/http/pecl_http.git;a=patch;h=441de41329327d32937f107da371435d14d7be36
+sed -e '/ZEND_MOD_CONFLICTS/d' -i php_http.c
+
 extver=$(sed -n '/#define PHP_PECL_HTTP_VERSION/{s/.* "//;s/".*$//;p}' php_http.h)
 if test "x${extver}" != "x%{version}%{?prever}"; then
    : Error: Upstream HTTP version is now ${extver}, expecting %{version}%{?prever}.
@@ -217,6 +218,10 @@ fi
 
 
 %changelog
+* Tue Dec 10 2013 Remi Collet <remi at fedoraproject.org> - 2.0.3-1
+- Update to 2.0.3 (stable)
+- drop Conflicts with pecl/event
+
 * Tue Nov 26 2013 Remi Collet <remi at fedoraproject.org> - 2.0.1-1
 - Update to 2.0.1 (stable)
 
diff --git a/sources b/sources
index d0a6730..4335dc5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-53beac2317c6d468590b39926aae59a0  pecl_http-2.0.1.tgz
+e2b23dcb43cd1af318558e7c114b4352  pecl_http-2.0.3.tgz


More information about the scm-commits mailing list