[php-horde-Horde-Nls/f18] update to 2.0.3

[Remi Collet]

commit e81e4cc0467d50524557bce8cf26c1822c2ff6e3
Author: Remi Collet <remi at fedoraproject.org>
Date:   Mon Jun 3 06:53:54 2013 +0200

    update to 2.0.3

 .gitignore               |    2 +
 php-horde-Horde-Nls.spec |   65 +++++++++++++++++++++++++++++----------------
 sources                  |    2 +-
 3 files changed, 45 insertions(+), 24 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0806ff1..6c99981 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,7 @@
+*spec~
 /Horde_Nls-1.1.3.tgz
 /Horde_Nls-1.1.5.tgz
 /Horde_Nls-1.1.6.tgz
 /Horde_Nls-2.0.1.tgz
 /Horde_Nls-2.0.2.tgz
+/Horde_Nls-2.0.3.tgz
diff --git a/php-horde-Horde-Nls.spec b/php-horde-Horde-Nls.spec
index cb2fe60..9cd0026 100644
--- a/php-horde-Horde-Nls.spec
+++ b/php-horde-Horde-Nls.spec
@@ -1,33 +1,47 @@
-%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
 %{!?pear_metadir: %global pear_metadir %{pear_phpdir}}
-%global pear_name Horde_Nls
+%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
+%global pear_name    Horde_Nls
+%global pear_channel pear.horde.org
 
 Name:           php-horde-Horde-Nls
-Version:        2.0.2
+Version:        2.0.3
 Release:        1%{?dist}
 Summary:        Native Language Support (NLS)
 
 Group:          Development/Libraries
-License:        LGPLv2+
-URL:            http://pear.horde.org
-Source0:        http://pear.horde.org/get/%{pear_name}-%{version}.tgz
+License:        LGPLv2
+URL:            http://%{pear_channel}
+Source0:        http://%{pear_channel}/get/%{pear_name}-%{version}.tgz
 
 BuildArch:      noarch
-BuildRequires:  php-pear(PEAR) >= 1.7.0
 BuildRequires:  gettext
+BuildRequires:  php(language) >= 5.3.0
+BuildRequires:  php-pear(PEAR) >= 1.7.0
+BuildRequires:  php-channel(%{pear_channel})
+
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
-Requires:       php-common >= 5.3.0
-Requires:       php-pear(pear.horde.org/Horde_Util) >= 2.0.0
-Requires:       php-pear(pear.horde.org/Horde_Translation) >= 2.0.0
+Requires:       php(language) >= 5.3.0
+Requires:       php-date
+Requires:       php-pcre
 Requires:       php-pear(PEAR) >= 1.7.0
-Provides:       php-pear(pear.horde.org/Horde_Nls) = %{version}
-BuildRequires:  php-channel(pear.horde.org)
+Requires:       php-channel(%{pear_channel})
+Requires:       php-pear(%{pear_channel}/Horde_Util) >= 2.0.0
+Requires:       php-pear(%{pear_channel}/Horde_Util) <  3.0.0
+Requires:       php-pear(%{pear_channel}/Horde_Translation) >= 2.0.0
+Requires:       php-pear(%{pear_channel}/Horde_Translation) <  3.0.0
+# Optional
+Requires:       php-pecl(geoip)
+Requires:       php-pear(Net_DNS2)
+
+Provides:       php-pear(%{pear_channel}/%{pear_name}) = %{version}
+
 
 %description
 Common methods for handling language data, timezones, and hostname->country
 lookups.
 
+
 %prep
 %setup -q -c
 cd %{pear_name}-%{version}
@@ -38,6 +52,7 @@ sed -e '/%{pear_name}.po/d' \
     -e '/%{pear_name}.mo/s/md5sum=.*name=/name=/' \
     ../package.xml >%{name}.xml
 
+
 %build
 cd %{pear_name}-%{version}
 
@@ -47,17 +62,17 @@ do
    msgfmt $po -o $(dirname $po)/$(basename $po .po).mo
 done
 
+
 %install
 cd %{pear_name}-%{version}
-rm -rf $RPM_BUILD_ROOT
-%{__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/{??,??_??}
@@ -66,6 +81,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 || :
@@ -73,7 +89,7 @@ done | tee ../%{pear_name}.lang
 %postun
 if [ $1 -eq 0 ] ; then
     %{__pear} uninstall --nodeps --ignore-errors --register-only \
-        pear.horde.org/%{pear_name} >/dev/null || :
+        %{pear_channel}/%{pear_name} >/dev/null || :
 fi
 
 
@@ -82,13 +98,16 @@ fi
 %{pear_xmldir}/%{name}.xml
 %{pear_phpdir}/Horde/Nls
 %{pear_phpdir}/Horde/Nls.php
-# own locales (non standard) directories, .mo own by find_lang
-%dir %{pear_datadir}/Horde_Nls
-%dir %{pear_datadir}/Horde_Nls/locale
-%dir %{pear_datadir}/Horde_Nls/locale/*
-%dir %{pear_datadir}/Horde_Nls/locale/*/LC_MESSAGES
+%dir %{pear_datadir}/%{pear_name}
+%dir %{pear_datadir}/%{pear_name}/locale
+
 
 %changelog
+* Fri May 31 2013 Remi Collet <remi at fedoraproject.org> - 2.0.3-1
+- Update to 2.0.3
+- spec cleanups
+- fix License
+
 * Fri Jan 11 2013 Nick Bebout <nb at fedoraproject.org> - 2.0.2-1
 - Update to 2.0.2
 
diff --git a/sources b/sources
index 3931b08..3c2ae7d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8bdb084d61d6afbac7664dd9ccb48e3c  Horde_Nls-2.0.2.tgz
+e44ad9210752ddff7ea34f6fcb350fb5  Horde_Nls-2.0.3.tgz