[php-horde-Horde-Translation/el6] - Update to 2.1.0 - fix include_path for tests - spec cleanups

Tue Feb 11 13:48:36 UTC 2014

commit b1aa74423c066840c7029607257a94f6f6b6a662
Author: Remi Collet <remi at fedoraproject.org>
Date:   Tue Feb 11 14:49:10 2014 +0100

    - Update to 2.1.0
    - fix include_path for tests
    - spec cleanups

 .gitignore                       |    1 +
 php-horde-Horde-Translation.spec |  112 ++++++++++++++++++++++++--------------
 sources                          |    2 +-
 3 files changed, 72 insertions(+), 43 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 071b074..1f03617 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /Horde_Translation-1.0.2.tgz
 /Horde_Translation-2.0.0.tgz
 /Horde_Translation-2.0.1.tgz
+/Horde_Translation-2.1.0.tgz
diff --git a/php-horde-Horde-Translation.spec b/php-horde-Horde-Translation.spec
index ead04e1..084360f 100644
--- a/php-horde-Horde-Translation.spec
+++ b/php-horde-Horde-Translation.spec
@@ -1,32 +1,57 @@
-%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
+# spec file for php-horde-Horde-Translation
+#
+# Copyright (c) 2012-2014 Nick Bebout, Remi Collet
+#
+# License: MIT
+# https://fedoraproject.org/wiki/Licensing:MIT#Modern_Style_with_sublicense
+#
+# Please, preserve the changelog entries
+#
+%{!?__pear:       %global __pear       %{_bindir}/pear}
 %{!?pear_metadir: %global pear_metadir %{pear_phpdir}}
-%global pear_name Horde_Translation
+%global pear_name    Horde_Translation
+%global pear_channel pear.horde.org
+
+# Can run test because of circular dependency with Horde_Test
+%global with_tests   %{?_with_tests:1}%{!?_with_tests:0}
 
 Name:           php-horde-Horde-Translation
-Version:        2.0.1
+Version:        2.1.0
 Release:        1%{?dist}
 Summary:        Horde translation library
 
 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:  gettext
+BuildRequires:  php(language) >= 5.3.0
 BuildRequires:  php-pear(PEAR) >= 1.7.0
+BuildRequires:  php-channel(%{pear_channel})
+%if %{with_tests}
+# To run unit tests
+BuildRequires:  php-pear(%{pear_channel}/Horde_Test) >= 2.1.0
+%endif
+
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
-Provides:       php-pear(pear.horde.org/Horde_Translation) = %{version}
-BuildRequires:  php-channel(pear.horde.org)
-BuildRequires:  gettext
-Requires:       php-channel(pear.horde.org)
-Requires:       php-common >= 5.3.0
+Requires:       php-pear(PEAR) >= 1.7.0
+Requires:       php-channel(%{pear_channel})
+Requires:       php(language) >= 5.3.0
+Requires:       php-gettext
+Requires:       php-spl
+
+Provides:       php-pear(%{pear_channel}/%{pear_name}) = %{version}
+
 
 %description
 Translation wrappers.
 
 %prep
 %setup -q -c
+
 cd %{pear_name}-%{version}
 
 # Don't install .po and .pot files
@@ -36,39 +61,41 @@ sed -e '/%{pear_name}.po/d' \
     -e '/%{pear_name}.mo/s/md5sum=.*name=/name=/' \
     ../package.xml >%{name}.xml
 
+
 %build
 cd %{pear_name}-%{version}
 
 # Regenerate the locales
-for po in $(find . -name \*.po)
+for po in $(find test -name \*.po)
 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}
+
+
+%check
+%if %{with_tests}
+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} \
+    -d date.timezone=UTC \
+    .
+%else
+: Test disabled, missing '--with tests' option.
+%endif
 
-# Locales
-for loc in locale/{??,??_??}
-do
-    lang=$(basename $loc)
-    test -d $loc && echo "%%lang(${lang%_*}) %{pear_datadir}/%{pear_name}/$loc"
-done | tee ../%{pear_name}.lang
-# Locales
-for loc in locale/{??,??_??}
-do
-    lang=$(basename $loc)
-    test -d $loc && echo "%%lang(${lang%_*}) %{pear_datadir}/Horde_Other/$loc"
-done | tee ../%{pear_name}.lang
 
 %post
 %{__pear} install --nodeps --soft --force --register-only \
@@ -77,30 +104,31 @@ 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
 
 
-%files -f %{pear_name}.lang
-# own locales (non standard) directories, .mo own by find_lang
+%files
 %{pear_xmldir}/%{name}.xml
 %dir %{pear_phpdir}/Horde
 %{pear_phpdir}/Horde/Translation
 %{pear_phpdir}/Horde/Translation.php
-%{pear_docdir}/Horde_Translation
-# own locales (non standard) directories, .mo own by find_lang
-%dir %{pear_testdir}/Horde_Translation
-%dir %{pear_testdir}/Horde_Translation/Horde
-%dir %{pear_testdir}/Horde_Translation/Horde/Translation
-%dir %{pear_testdir}/Horde_Translation/Horde/Translation/locale
-%dir %{pear_testdir}/Horde_Translation/Horde/Translation/locale/de
-%dir %{pear_testdir}/Horde_Translation/Horde/Translation/locale/de/LC_MESSAGES
-%{pear_testdir}/Horde_Translation/Horde/Translation/*.php
-%{pear_testdir}/Horde_Translation/Horde/Translation/phpunit.xml
-%lang(de) %{pear_testdir}/Horde_Translation/Horde/Translation/locale/de/LC_MESSAGES/Horde_Other.mo
-%lang(de) %{pear_testdir}/Horde_Translation/Horde/Translation/locale/de/LC_MESSAGES/Horde_Translation.mo
+%doc %{pear_docdir}/%{pear_name}
+%dir %{pear_testdir}/%{pear_name}
+%dir %{pear_testdir}/%{pear_name}/Horde
+%dir %{pear_testdir}/%{pear_name}/Horde/Translation
+%dir %{pear_testdir}/%{pear_name}/Horde/Translation/locale
+%lang(de) %{pear_testdir}/%{pear_name}/Horde/Translation/locale/de
+%{pear_testdir}/%{pear_name}/Horde/Translation/*.php
+%{pear_testdir}/%{pear_name}/Horde/Translation/phpunit.xml
+
 
 %changelog
+* Tue Feb 11 2014 Remi Collet <remi at fedoraproject.org> - 2.1.0-1
+- Update to 2.1.0
+- fix include_path for tests
+- spec cleanups
+
 * Wed Dec 12 2012 Nick Bebout <nb at fedoraproject.org> - 2.0.1-1
 - Update to 2.0.1
 
diff --git a/sources b/sources
index 226d62c..c75704c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f60591bd89a777bd8fabdc4e19cba9c1  Horde_Translation-2.0.1.tgz
+20d904f7a7ed6b43ee0175f0a98363f9  Horde_Translation-2.1.0.tgz
