[php-pecl-http/el6] update to 2.0.5

[Remi Collet]

commit e3843726f642b140d519e712c4c2e4db914ced48
Author: Remi Collet <remi at fedoraproject.org>
Date:   Fri Apr 4 16:34:34 2014 +0200

    update to 2.0.5
    
    (cherry picked from commit ff33672a8eab1ebc17d9a02eacfd33f42c062ee3)
    (cherry picked from commit 24eb87bbbdb602581a58eb3d01c35938574d0366)

 .gitignore            |    1 +
 pecl_http-build.patch |   25 -------------------------
 php-pecl-http.spec    |   37 ++++++++++++++++++++++---------------
 sources               |    2 +-
 4 files changed, 24 insertions(+), 41 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3acc6ae..d80b275 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@ php-pecl-http.spec~
 /pecl_http-2.0.1.tgz
 /pecl_http-2.0.3.tgz
 /pecl_http-2.0.4.tgz
+/pecl_http-2.0.5.tgz
diff --git a/php-pecl-http.spec b/php-pecl-http.spec
index 746d97b..b11bc78 100644
--- a/php-pecl-http.spec
+++ b/php-pecl-http.spec
@@ -6,10 +6,10 @@
 #
 # Please, preserve the changelog entries
 #
-%{!?php_inidir:  %global php_inidir  %{_sysconfdir}/php.d}
-%{!?php_incldir: %global php_incldir %{_includedir}/php}
-%{!?__pecl:      %global __pecl      %{_bindir}/pecl}
-%{!?__php:       %global __php       %{_bindir}/php}
+%{!?php_inidir:  %global php_inidir   %{_sysconfdir}/php.d}
+%{!?php_incldir: %global php_incldir  %{_includedir}/php}
+%{!?__pecl:      %global __pecl       %{_bindir}/pecl}
+%{!?__php:       %global __php        %{_bindir}/php}
 
 # The project is pecl_http but the extension is only http
 %global proj_name pecl_http
@@ -17,7 +17,7 @@
 %global with_zts  0%{?__ztsphp:1}
 
 Name:           php-pecl-http
-Version:        2.0.4
+Version:        2.0.5
 Release:        1%{?dist}
 Summary:        Extended HTTP support
 
@@ -26,8 +26,6 @@ Group:          Development/Languages
 URL:            http://pecl.php.net/package/pecl_http
 Source0:        http://pecl.php.net/get/%{proj_name}-%{version}%{?prever}.tgz
 
-Patch0:         %{proj_name}-build.patch
-
 # From http://www.php.net/manual/en/http.configuration.php
 Source1:        %{proj_name}.ini
 
@@ -39,10 +37,10 @@ BuildRequires:  php-spl
 BuildRequires:  php-pear
 BuildRequires:  pcre-devel
 BuildRequires:  zlib-devel >= 1.2.0.4
-BuildRequires:  libevent-devel >= 1.4
 BuildRequires:  curl-devel >= 7.18.2
 BuildRequires:  php-pecl-propro-devel
 BuildRequires:  php-pecl-raphf-devel
+BuildRequires:  libevent-devel >= 1.4
 
 Requires(post): %{__pecl}
 Requires(postun): %{__pecl}
@@ -70,11 +68,11 @@ Provides:       php-pecl(%{pecl_name})%{?_isa} = %{version}%{?prever}
 Provides:       php-%{pecl_name}               = %{version}%{?prever}
 Provides:       php-%{pecl_name}%{?_isa}       = %{version}%{?prever}
 
-%if 0%{?fedora} < 20
+%if 0%{?fedora} < 20 && 0%{?rhel} < 7
 # Filter shared private
 %{?filter_provides_in: %filter_provides_in %{_libdir}/.*\.so$}
-%{?filter_setup}
 %endif
+%{?filter_setup}
 
 
 %description
@@ -113,9 +111,6 @@ These are the files needed to compile programs using HTTP extension.
 
 mv %{proj_name}-%{version}%{?prever} NTS
 cd NTS
-
-%patch0 -p1
-
 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}.
@@ -133,15 +128,24 @@ cp -pr NTS ZTS
 
 
 %build
+peclconf() {
+%configure \
+  --with-http \
+  --with-http-zlib-dir=%{_prefix} \
+  --with-http-libcurl-dir=%{_prefix} \
+  --with-http-libevent-dir=%{_prefix} \
+  --with-libdir=%{_lib} \
+  --with-php-config=$1
+}
 cd NTS
 %{_bindir}/phpize
-%configure  --with-php-config=%{_bindir}/php-config
+peclconf %{_bindir}/php-config
 make %{?_smp_mflags}
 
 %if %{with_zts}
 cd ../ZTS
 %{_bindir}/zts-phpize
-%configure  --with-php-config=%{_bindir}/zts-php-config
+peclconf %{_bindir}/zts-php-config
 make %{?_smp_mflags}
 %endif
 
@@ -225,6 +229,9 @@ fi
 
 
 %changelog
+* Fri Apr 04 2014 Remi Collet <remi at fedoraproject.org> - 2.0.5-1
+- Update to 2.0.5
+
 * Thu Jan 02 2014 Remi Collet <remi at fedoraproject.org> - 2.0.4-1
 - Update to 2.0.4
 - fix link to documentation
diff --git a/sources b/sources
index 2e9c24b..2f53616 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-75bdcf0e5f3788ef593e97c22cc4b8b1  pecl_http-2.0.4.tgz
+14715aedd483c0ebdd08b56c00c4c5bf  pecl_http-2.0.5.tgz