[php-horde-Horde-Browser] php-horde-Horde-Browser: 2.0.4 + cleanups

[Remi Collet]

commit 8309c20f070b50f62e28d5effc71ae38463315b2
Author: Remi Collet <remi at fedoraproject.org>
Date:   Tue Aug 27 14:46:58 2013 +0200

    php-horde-Horde-Browser: 2.0.4 + cleanups

 .gitignore                   |    1 +
 php-horde-Horde-Browser.spec |   45 +++++++++++++++++++++++++++--------------
 sources                      |    2 +-
 3 files changed, 31 insertions(+), 17 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1a3a016..2d1378e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /Horde_Browser-2.0.2.tgz
 /Horde_Browser-2.0.3.tgz
+/Horde_Browser-2.0.4.tgz
diff --git a/php-horde-Horde-Browser.spec b/php-horde-Horde-Browser.spec
index 74f9cdc..ad52f98 100644
--- a/php-horde-Horde-Browser.spec
+++ b/php-horde-Horde-Browser.spec
@@ -1,38 +1,42 @@
-%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
 %{!?pear_metadir: %global pear_metadir %{pear_phpdir}}
+%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
+%global pear_name    Horde_Browser
 %global pear_channel pear.horde.org
-%global pear_name Horde_Browser
 
 Name:           php-horde-Horde-Browser
-Version:        2.0.3
-Release:        3%{?dist}
+Version:        2.0.4
+Release:        1%{?dist}
 Summary:        Horde Browser API
 
 Group:          Development/Libraries
 License:        LGPLv2+
 URL:            http://pear.horde.org
-Source0:        http://pear.horde.org/get/%{pear_name}-%{version}.tgz
+Source0:        http://%{pear_channel}/get/%{pear_name}-%{version}.tgz
 
 BuildArch:      noarch
 BuildRequires:  php-pear(PEAR) >= 1.7.0
-BuildRequires:  gettext
 BuildRequires:  php-channel(%{pear_channel})
+BuildRequires:  gettext
 
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
-Requires:       php-pear(%{pear_channel}/Horde_Exception) >= 2.0.0
-Requires:       php-pear(%{pear_channel}/Horde_Util) >= 2.0.0
+Requires:       php(language) >= 5.3.0
+Requires:       php-pcre
 Requires:       php-pear(PEAR) >= 1.7.0
-Requires:       php-common >= 5.3.0
 Requires:       php-channel(%{pear_channel})
-Requires:       php-pcre
+Requires:       php-pear(%{pear_channel}/Horde_Exception) >= 2.0.0
+Requires:       php-pear(%{pear_channel}/Horde_Exception) <  3.0.0
+Requires:       php-pear(%{pear_channel}/Horde_Util) >= 2.0.0
+Requires:       php-pear(%{pear_channel}/Horde_Util) <  3.0.0
+
+Provides:       php-pear(%{pear_channel}/%{pear_name}) = %{version}
 
-Provides:       php-pear(%{pear_channel}/Horde_Browser) = %{version}
 
 %description
 The Horde_Browser class provides an API for getting information about the
 current user's browser and its capabilities.
 
+
 %prep
 %setup -q -c
 cd %{pear_name}-%{version}
@@ -44,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}
 
@@ -53,24 +58,27 @@ 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/{??,??_??}
 do
     lang=$(basename $loc)
-    test -d $loc && echo "%%lang(${lang%_*}) %{pear_datadir}/%{pear_name}/$loc"
+    test -d %{buildroot}%{pear_datadir}/%{pear_name}/$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 || :
@@ -81,6 +89,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
@@ -89,7 +98,11 @@ fi
 %dir %{pear_datadir}/%{pear_name}
 %dir %{pear_datadir}/%{pear_name}/locale
 
+
 %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-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
diff --git a/sources b/sources
index 129f8be..12544c5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-74de5e910c3915c04857801a5a1904db  Horde_Browser-2.0.3.tgz
+42861d197e174699908ad19769fc2f3f  Horde_Browser-2.0.4.tgz