remi pushed to php-horde-Horde-Http (f21). "update to 2.1.5 (..more)"

[notifications at fedoraproject.org]

>From 9c2bf69342db0b0d0efbd2fe961e8a40d25b7f0d Mon Sep 17 00:00:00 2001
From: Remi Collet <remi at fedoraproject.org>
Date: Tue, 14 Apr 2015 17:55:47 +0200
Subject: update to 2.1.5

(cherry picked from commit a950cbf8933f7b8912e93df2e19ca2edec45575c)

diff --git a/.gitignore b/.gitignore
index 68923e5..3a5f610 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ clog
 /Horde_Http-2.1.2.tgz
 /Horde_Http-2.1.3.tgz
 /Horde_Http-2.1.4.tgz
+/Horde_Http-2.1.5.tgz
diff --git a/Horde_Http-pr125.patch b/Horde_Http-pr125.patch
deleted file mode 100644
index 518d67c..0000000
--- a/Horde_Http-pr125.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-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 0afbf51..1d779ec 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.4
+Version:        2.1.5
 Release:        1%{?dist}
 Summary:        Horde HTTP libraries
 
@@ -28,9 +28,6 @@ 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
@@ -70,9 +67,7 @@ Optional dependency: php-pecl-http or php-pecl-http1
 %setup -q -c
 
 cd %{pear_name}-%{version}
-%patch0 -p3 -b .pr125
-sed -e '/TestBase.php/s/md5sum="[^"]*"//' \
-    ../package.xml > %{name}.xml
+mv ../package.xml %{name}.xml
 
 
 %build
@@ -121,6 +116,10 @@ fi
 
 
 %changelog
+* Tue Apr 14 2015 Remi Collet <remi at fedoraproject.org> - 2.1.5-1
+- Update to 2.1.5
+- drop patch, merged upstream
+
 * 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
diff --git a/sources b/sources
index 2cbd14b..0fa8d48 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-90b26fd9b359931d3cd3278fbffb1cd8  Horde_Http-2.1.4.tgz
+d6ce3003d117d7eac2203f271dc6efbe  Horde_Http-2.1.5.tgz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/php-horde-Horde-Http.git/commit/?h=f21&id=9c2bf69342db0b0d0efbd2fe961e8a40d25b7f0d