[php-horde-Horde-Http] update to 2.0.4

[Remi Collet]

commit 64477bdbbce30cad7c82848254ef69106e96a3e4
Author: Remi Collet <remi at fedoraproject.org>
Date:   Tue Aug 27 14:55:07 2013 +0200

    update to 2.0.4

 .gitignore                |    1 +
 php-horde-Horde-Http.spec |   11 +++++++----
 sources                   |    2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index bf4d1e2..39b05eb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /Horde_Http-2.0.1.tgz
 /Horde_Http-2.0.2.tgz
 /Horde_Http-2.0.3.tgz
+/Horde_Http-2.0.4.tgz
diff --git a/php-horde-Horde-Http.spec b/php-horde-Horde-Http.spec
index ff95a14..7c54133 100644
--- a/php-horde-Horde-Http.spec
+++ b/php-horde-Horde-Http.spec
@@ -7,8 +7,8 @@
 %global with_tests   %{?_with_tests:1}%{!?_with_tests:0}
 
 Name:           php-horde-Horde-Http
-Version:        2.0.3
-Release:        2%{?dist}
+Version:        2.0.4
+Release:        1%{?dist}
 Summary:        Horde HTTP libraries
 
 Group:          Development/Libraries
@@ -33,9 +33,9 @@ Requires:       php-pcre
 Requires:       php-pear(PEAR) >= 1.7.0
 Requires:       php-channel(%{pear_channel})
 Requires:       php-pear(%{pear_channel}/Horde_Exception) >= 2.0.0
-Conflicts:      php-pear(%{pear_channel}/Horde_Exception) >= 3.0.0
+Requires:       php-pear(%{pear_channel}/Horde_Exception) <  3.0.0
 Requires:       php-pear(%{pear_channel}/Horde_Support) >= 2.0.0
-Conflicts:      php-pear(%{pear_channel}/Horde_Support) >= 3.0.0
+Requires:       php-pear(%{pear_channel}/Horde_Support) <  3.0.0
 # Optionnal
 Requires:       php-curl
 # php-pecl-http v1 optional but not available (only v2)
@@ -103,6 +103,9 @@ fi
 
 
 %changelog
+* Tue Aug 27 2013 Remi Collet <remi at fedoraproject.org> - 2.0.4-1
+- Update to 2.0.4
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
diff --git a/sources b/sources
index b8b0bc0..aa19946 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-14f0e584f2f410ff507034f535f7508c  Horde_Http-2.0.3.tgz
+2c293b9f469c248a67fb93661ea19104  Horde_Http-2.0.4.tgz