[php-horde-Horde-Http] - Update to 2.1.4 - open https://github.com/horde/horde/pull/125

Remi Collet remi at fedoraproject.org
Wed Mar 4 10:30:07 UTC 2015


commit f7a15e32f4d9d4f53e4ec0edad3101709bd89cfc
Author: Remi Collet <remi at fedoraproject.org>
Date:   Wed Mar 4 11:29:56 2015 +0100

    - Update to 2.1.4
    - open https://github.com/horde/horde/pull/125

 .gitignore                |  1 +
 Horde_Http-pr125.patch    | 21 +++++++++++++++++++++
 php-horde-Horde-Http.spec | 13 +++++++++++--
 sources                   |  2 +-
 4 files changed, 34 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 184c0fa..68923e5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ clog
 /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 8d267cc..83ca76b 100644
--- a/php-horde-Horde-Http.spec
+++ b/php-horde-Horde-Http.spec
@@ -19,7 +19,7 @@
 %endif
 
 Name:           php-horde-Horde-Http
-Version:        2.1.3
+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
@@ -67,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
@@ -116,6 +121,10 @@ 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
+
 * Thu Jan 08 2015 Remi Collet <remi at fedoraproject.org> - 2.1.3-1
 - Update to 2.1.3
 - add provides php-composer(horde/horde-http)
diff --git a/sources b/sources
index 9497831..2cbd14b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ac802c77b90eabe997f732ced6ca86a1  Horde_Http-2.1.3.tgz
+90b26fd9b359931d3cd3278fbffb1cd8  Horde_Http-2.1.4.tgz


More information about the scm-commits mailing list