From a3e9a61c3fa93d37741c47edbb8e33eaa00b3c9a Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Thu, 13 Dec 2012 19:43:51 +0100
Subject: [PATCH] update to 2.0.0beta3

---
 .gitignore         |  1 +
 php-pecl-http.spec | 36 +++++++++++++++++++++++++++++-------
 sources            |  2 +-
 3 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index 09398ed..27fd6f5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ package-*.xml
 /pecl_http-2.0.0alpha1.tgz
 /pecl_http-2.0.0beta1.tgz
 /pecl_http-2.0.0beta2.tgz
+/pecl_http-2.0.0beta3.tgz
diff --git a/php-pecl-http.spec b/php-pecl-http.spec
index 98b45c9..4271468 100644
--- a/php-pecl-http.spec
+++ b/php-pecl-http.spec
@@ -3,11 +3,11 @@
 # The project is pecl_http but the extension is only http
 %global proj_name pecl_http
 %global pecl_name http
-%global prever    beta2
+%global prever    beta3
 
 Name:           php-pecl-http
 Version:        2.0.0
-Release:        0.12.%{prever}%{?dist}
+Release:        0.13.%{prever}%{?dist}
 Summary:        Extended HTTP support
 
 License:        BSD
@@ -19,7 +19,10 @@ Source0:        http://pecl.php.net/get/%{proj_name}-%{version}%{?prever}.tgz
 Source1:        %{proj_name}.ini
 
 BuildRequires:  php-devel >= 5.3.0
+BuildRequires:  php-hash
+BuildRequires:  php-iconv
 BuildRequires:  php-json
+BuildRequires:  php-spl
 BuildRequires:  php-pear
 BuildRequires:  pcre-devel
 BuildRequires:  zlib-devel >= 1.2.0.4
@@ -31,7 +34,11 @@ Requires(post): %{__pecl}
 Requires(postun): %{__pecl}
 Requires:       php(zend-abi) = %{php_zend_api}
 Requires:       php(api) = %{php_core_api}
+Requires:       php-hash
+Requires:       php-iconv
 Requires:       php-json
+Requires:       php-spl
+Conflicts:      php-event
 
 Provides:       php-pecl(%{proj_name})         = %{version}%{?prever}
 Provides:       php-pecl(%{proj_name})%{?_isa} = %{version}%{?prever}
@@ -75,12 +82,15 @@ These are the files needed to compile programs using HTTP extension.
 %prep
 %setup -c -q 
 
-extver=$(sed -n '/#define PHP_HTTP_EXT_VERSION/{s/.* "//;s/".*$//;p}' %{proj_name}-%{version}%{?prever}/php_http.h)
+cd %{proj_name}-%{version}%{?prever}
+
+extver=$(sed -n '/#define PHP_HTTP_EXT_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}.
    : Update the pdover macro and rebuild.
    exit 1
 fi
+cd ..
 
 cp %{SOURCE1} %{pecl_name}.ini
 
@@ -115,19 +125,27 @@ install -Dpm644 %{pecl_name}.ini %{buildroot}%{php_ztsinidir}/z-%{pecl_name}.ini
 
 
 %check
+# Install needed extensions
+modules=""
+for mod in json hash iconv; do
+  if [ -f %{php_extdir}/${mod}.so ]; then
+    ln -sf %{php_extdir}/${mod}.so    %{proj_name}-%{version}%{?prever}/modules
+    ln -sf %{php_ztsextdir}/${mod}.so %{proj_name}-zts/modules
+    modules="$modules --define extension=${mod}.so"
+  fi
+done
+
 # Minimal load test for NTS extension
-ln -sf %{php_extdir}/json.so %{proj_name}-%{version}%{?prever}/modules
 %{__php} --no-php-ini \
     --define extension_dir=%{proj_name}-%{version}%{?prever}/modules \
-    --define extension=json.so \
+    $modules \
     --define extension=%{pecl_name}.so \
     --modules | grep %{pecl_name}
 
 # Minimal load test for ZTS extension
-ln -sf %{php_ztsextdir}/json.so %{proj_name}-zts/modules
 %{__ztsphp} --no-php-ini \
     --define extension_dir=%{proj_name}-zts/modules \
-    --define extension=json.so \
+    $modules \
     --define extension=%{pecl_name}.so \
     --modules | grep %{pecl_name}
 
@@ -156,6 +174,10 @@ fi
 
 
 %changelog
+* Thu Dec 13 2012 Remi Collet <remi@fedoraproject.org> - 2.0.0-0.13.beta3
+- update to 2.0.0beta3
+- fix requires
+
 * Thu Nov 29 2012 Remi Collet <remi@fedoraproject.org> - 2.0.0-0.12.beta2
 - update to 2.0.0beta2
 - also provides php-http
diff --git a/sources b/sources
index 0d13437..12b499b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8a78443a789e7aef67a741339d73977c  pecl_http-2.0.0beta2.tgz
+dec6f1ccee0e7ee613b16b931af94b1d  pecl_http-2.0.0beta3.tgz