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

[Remi Collet]

commit bd1199e2247a0ee6aa22c9d7e641a0b8672f153a
Author: Remi Collet <remi at fedoraproject.org>
Date:   Thu Jul 25 15:49:21 2013 +0200

    update to 2.0.4

 .gitignore                    |    2 ++
 php-horde-Horde-Compress.spec |   17 ++++++++++-------
 sources                       |    2 +-
 3 files changed, 13 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 16b41c2..479924e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
+*spec~
 /Horde_Compress-2.0.3.tgz
+/Horde_Compress-2.0.4.tgz
diff --git a/php-horde-Horde-Compress.spec b/php-horde-Horde-Compress.spec
index c93a9e5..f551cb6 100644
--- a/php-horde-Horde-Compress.spec
+++ b/php-horde-Horde-Compress.spec
@@ -4,8 +4,8 @@
 %global pear_channel pear.horde.org
 
 Name:           php-horde-Horde-Compress
-Version:        2.0.3
-Release:        3%{?dist}
+Version:        2.0.4
+Release:        1%{?dist}
 Summary:        Horde Compression API
 
 Group:          Development/Libraries
@@ -29,15 +29,15 @@ 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_Translation) >= 2.0.0
-Conflicts:      php-pear(%{pear_channel}/Horde_Translation) >= 3.0.0
+Requires:       php-pear(%{pear_channel}/Horde_Translation) <  3.0.0
 Requires:       php-pear(%{pear_channel}/Horde_Util) >= 2.0.0
-Conflicts:      php-pear(%{pear_channel}/Horde_Util) >= 3.0.0
+Requires:       php-pear(%{pear_channel}/Horde_Util) <  3.0.0
 # Optional
 Requires:       php-zlib
 Requires:       php-pear(%{pear_channel}/Horde_Stream_Filter) >= 2.0.0
-Conflicts:      php-pear(%{pear_channel}/Horde_Stream_Filter) >= 3.0.0
+Requires:       php-pear(%{pear_channel}/Horde_Stream_Filter) <  3.0.0
 
 Provides:       php-pear(%{pear_channel}/%{pear_name}) = %{version}
 
@@ -85,7 +85,7 @@ done | tee ../%{pear_name}.lang
 
 
 %check
-src=${pwd}/%{pear_name}-%{version}
+src=$(pwd)/%{pear_name}-%{version}
 cd %{pear_name}-%{version}/test/$(echo %{pear_name} | sed -e s:_:/:g)
 phpunit \
     -d include_path=$src/lib:.:%{pear_phpdir} \
@@ -114,6 +114,9 @@ fi
 
 
 %changelog
+* Thu Jul 25 2013 Remi Collet <remi at fedoraproject.org> - 2.0.4-1
+- Update to 2.0.4
+
 * Wed Mar 20 2013 Nick Bebout <nb at fedoraproject.org> - 2.0.3-3
 - Update for review
 
diff --git a/sources b/sources
index 5788b97..7fa4c0f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-40190e347e3622f71bc6582e1995e5f1  Horde_Compress-2.0.3.tgz
+2386f6becacaa57aa53891175be4659a  Horde_Compress-2.0.4.tgz