[php-horde-Horde-Http/el6] - Update to 2.1.4 - open https://github.com/horde/horde/pull/125 - add provides php-composer(horde/h

[Remi Collet]

commit 6dd4d3c0566df386fb8733dcba5956cb3401c66b
Author: Remi Collet <remi at fedoraproject.org>
Date:   Wed Mar 4 11:33:49 2015 +0100

    - Update to 2.1.4
    - open https://github.com/horde/horde/pull/125
    - add provides php-composer(horde/horde-http)
    
    (cherry picked from commit 7869f64b0bfcdbce4e29cda37ec944cbcb692250)

 .gitignore                |  4 +++-
 Horde_Http-pr125.patch    | 21 +++++++++++++++++++++
 php-horde-Horde-Http.spec | 18 +++++++++++++++---
 sources                   |  2 +-
 4 files changed, 40 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1b8e701..68923e5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-*spec~
+clog
 /Horde_Http-1.1.1.tgz
 /Horde_Http-2.0.1.tgz
 /Horde_Http-2.0.2.tgz
@@ -8,3 +8,5 @@
 /Horde_Http-2.1.0.tgz
 /Horde_Http-2.1.1.tgz
 /Horde_Http-2.1.2.tgz
+/Horde_Http-2.1.3.tgz
+/Horde_Http-2.1.4.tgz
diff --git a/Horde_Http-pr125.patch b/Horde_Http-pr125.patch
new file mode 100644
index 0000000..518d67c
--- /dev/null
+++ b/Horde_Http-pr125.patch
@@ -0,0 +1,21 @@
+From c4221e8ddc0ab6b3f4f5e3ded80f4ef7501788f1 Mon Sep 17 00:00:00 2001
+From: Remi Collet <fedora at famillecollet.com>
+Date: Wed, 4 Mar 2015 07:44:15 +0100
+Subject: [PATCH] this test requires configuration
+
+---
+ framework/Http/test/Horde/Http/TestBase.php | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/framework/Http/test/Horde/Http/TestBase.php b/framework/Http/test/Horde/Http/TestBase.php
+index 14b3c92..29b3c37 100644
+--- a/framework/Http/test/Horde/Http/TestBase.php
++++ b/framework/Http/test/Horde/Http/TestBase.php
+@@ -38,6 +38,7 @@ public function setUp()
+ 
+     public function testRequest()
+     {
++        $this->_skipMissingConfig();
+         $client = new Horde_Http_Client(
+             array('request' => new self::$_requestClass())
+         );
diff --git a/php-horde-Horde-Http.spec b/php-horde-Horde-Http.spec
index 38152b7..0f48ccf 100644
--- a/php-horde-Horde-Http.spec
+++ b/php-horde-Horde-Http.spec
@@ -1,6 +1,6 @@
 # spec file for php-horde-Horde-Http
 #
-# Copyright (c) 2012-2014 Nick Bebout, Remi Collet
+# Copyright (c) 2012-2015 Nick Bebout, Remi Collet
 #
 # License: MIT
 # https://fedoraproject.org/wiki/Licensing:MIT#Modern_Style_with_sublicense
@@ -19,7 +19,7 @@
 %endif
 
 Name:           php-horde-Horde-Http
-Version:        2.1.2
+Version:        2.1.4
 Release:        1%{?dist}
 Summary:        Horde HTTP libraries
 
@@ -28,6 +28,9 @@ License:        BSD
 URL:            http://%{pear_channel}
 Source0:        http://%{pear_channel}/get/%{pear_name}-%{version}.tgz
 
+# https://github.com/horde/horde/pull/125
+Patch0:         %{pear_name}-pr125.patch
+
 BuildArch:      noarch
 BuildRequires:  php(language) >= 5.3.0
 BuildRequires:  php-pear(PEAR) >= 1.7.0
@@ -35,6 +38,7 @@ BuildRequires:  php-channel(%{pear_channel})
 %if %{with_tests}
 # To run unit tests
 BuildRequires:  php-pear(%{pear_channel}/Horde_Test) >= 2.1.0
+BuildRequires:  php-pecl(http) > 2
 %endif
 
 Requires(post): %{__pear}
@@ -53,6 +57,7 @@ Requires:       php-curl
 # php-pecl-http v1 or v2 optional
 
 Provides:       php-pear(%{pear_channel}/%{pear_name}) = %{version}
+Provides:       php-composer(horde/horde-http) = %{version}
 
 
 %description
@@ -65,7 +70,9 @@ Optional dependency: php-pecl-http or php-pecl-http1
 %setup -q -c
 
 cd %{pear_name}-%{version}
-mv ../package.xml %{name}.xml
+%patch0 -p3 -b .pr125
+sed -e '/TestBase.php/s/md5sum="[^"]*"//' \
+    ../package.xml > %{name}.xml
 
 
 %build
@@ -114,6 +121,11 @@ fi
 
 
 %changelog
+* Wed Mar 04 2015 Remi Collet <remi at fedoraproject.org> - 2.1.4-1
+- Update to 2.1.4
+- open https://github.com/horde/horde/pull/125
+- add provides php-composer(horde/horde-http)
+
 * Tue Dec 30 2014 Remi Collet <remi at fedoraproject.org> - 2.1.2-1
 - Update to 2.1.2
 - enable test suite
diff --git a/sources b/sources
index f4b1794..2cbd14b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a5c41e1540e0f45349d195d4d2366b65  Horde_Http-2.1.2.tgz
+90b26fd9b359931d3cd3278fbffb1cd8  Horde_Http-2.1.4.tgz