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

[Remi Collet]

commit 4054492c738ceda683c3d7369107f943e0fa8b57
Author: Remi Collet <remi at fedoraproject.org>
Date:   Thu Jul 25 15:10:27 2013 +0200

    update to 2.0.4

 .gitignore               |    2 ++
 php-horde-Horde-Cli.spec |   33 +++++++++++++++++++++++----------
 sources                  |    2 +-
 3 files changed, 26 insertions(+), 11 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7d32f3f..dd2c44f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,6 @@
+*spec~
 /Horde_Cli-1.0.4.tgz
 /Horde_Cli-2.0.1.tgz
 /Horde_Cli-2.0.2.tgz
 /Horde_Cli-2.0.3.tgz
+/Horde_Cli-2.0.4.tgz
diff --git a/php-horde-Horde-Cli.spec b/php-horde-Horde-Cli.spec
index dd5499d..46adbc0 100644
--- a/php-horde-Horde-Cli.spec
+++ b/php-horde-Horde-Cli.spec
@@ -4,7 +4,7 @@
 %global pear_channel pear.horde.org
 
 Name:           php-horde-Horde-Cli
-Version:        2.0.3
+Version:        2.0.4
 Release:        1%{?dist}
 Summary:        Horde Command Line Interface API
 
@@ -14,24 +14,29 @@ URL:            http://%{pear_channel}
 Source0:        http://%{pear_channel}/get/%{pear_name}-%{version}.tgz
 
 BuildArch:      noarch
+BuildRequires:  gettext
 BuildRequires:  php-pear(PEAR) >= 1.7.0
 BuildRequires:  php-channel(%{pear_channel})
-BuildRequires:  gettext
 
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
+Requires:       php(language) >= 5.3.0
+Requires:       php-pcre
+Requires:       php-session
+BuildRequires:  php-pear(PEAR) >= 1.7.0
+Requires:       php-channel(%{pear_channel})
 Requires:       php-pear(%{pear_channel}/Horde_Support) >= 2.0.0
+Requires:       php-pear(%{pear_channel}/Horde_Support) <  3.0.0
 Requires:       php-pear(%{pear_channel}/Horde_Translation) >= 2.0.0
-Requires:       php-pear(PEAR) >= 1.7.0
-Requires:       php-channel(%{pear_channel})
-Requires:       php-pcre php-session
-Requires:       php-common >= 5.3.0
+Requires:       php-pear(%{pear_channel}/Horde_Translation) <  3.0.0
 
 Provides:       php-pear(%{pear_channel}/%{pear_name}) = %{version}
 
+
 %description
 Horde_Cli:: API for basic command-line functionality/checks
 
+
 %prep
 %setup -q -c
 
@@ -43,6 +48,7 @@ sed -e '/%{pear_name}.po/d' \
     -e '/%{pear_name}.mo/s/md5sum=.*name=/name=/' \
     ../package.xml >%{name}.xml
 
+
 %build
 cd %{pear_name}-%{version}
 
@@ -52,16 +58,17 @@ do
    msgfmt $po -o $(dirname $po)/$(basename $po .po).mo
 done
 
+
 %install
 cd %{pear_name}-%{version}
-%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml
+%{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml
 
 # Clean up unnecessary files
-rm -rf $RPM_BUILD_ROOT%{pear_metadir}/.??*
+rm -rf %{buildroot}%{pear_metadir}/.??*
 
 # Install XML package description
-mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
-install -pm 644 %{name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
+mkdir -p %{buildroot}%{pear_xmldir}
+install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
 
 # Locales
 for loc in locale/{??,??_??}
@@ -70,6 +77,7 @@ do
     test -d $loc && echo "%%lang(${lang%_*}) %{pear_datadir}/%{pear_name}/$loc"
 done | tee ../%{pear_name}.lang
 
+
 %post
 %{__pear} install --nodeps --soft --force --register-only \
     %{pear_xmldir}/%{name}.xml >/dev/null || :
@@ -80,6 +88,7 @@ if [ $1 -eq 0 ] ; then
         %{pear_channel}/%{pear_name} >/dev/null || :
 fi
 
+
 %files -f %{pear_name}.lang
 %doc %{pear_docdir}/%{pear_name}
 %{pear_xmldir}/%{name}.xml
@@ -88,7 +97,11 @@ fi
 %dir %{pear_datadir}/%{pear_name}
 %dir %{pear_datadir}/%{pear_name}/locale
 
+
 %changelog
+* Wed Jul 25 2013 Remi Collet <remi at fedoraproject.org> - 2.0.4-1
+- Update to 2.0.4
+
 * Wed Jan 30 2013 Remi Collet <remi at fedoraproject.org> - 2.0.3-1
 - Update to 2.0.3
 - fix files listed twice
diff --git a/sources b/sources
index a1ae102..6d9e536 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4102045c14220f3d3390090f848e279b  Horde_Cli-2.0.3.tgz
+5c89caff67c7768e88973de8d3d15a90  Horde_Cli-2.0.4.tgz