[php-horde-Horde-Translation] update to 2.2.0

[Remi Collet]

commit e4127a93a5f68d18cfb59b2ad0eee12c198712ee
Author: Remi Collet <remi at fedoraproject.org>
Date:   Thu Nov 6 08:11:46 2014 +0100

    update to 2.2.0

 .gitignore                       |    2 ++
 php-horde-Horde-Translation.spec |   34 ++++++++++++++++------------------
 sources                          |    2 +-
 3 files changed, 19 insertions(+), 19 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1f03617..5fd99fd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,7 @@
+clog
 /Horde_Translation-1.0.1.tgz
 /Horde_Translation-1.0.2.tgz
 /Horde_Translation-2.0.0.tgz
 /Horde_Translation-2.0.1.tgz
 /Horde_Translation-2.1.0.tgz
+/Horde_Translation-2.2.0.tgz
diff --git a/php-horde-Horde-Translation.spec b/php-horde-Horde-Translation.spec
index 8c96cbd..53267e7 100644
--- a/php-horde-Horde-Translation.spec
+++ b/php-horde-Horde-Translation.spec
@@ -9,15 +9,19 @@
 #
 %{!?__pear:       %global __pear       %{_bindir}/pear}
 %{!?pear_metadir: %global pear_metadir %{pear_phpdir}}
+# bootstrap when dependency on Horde_Test requires a new version
+%global bootstrap    0
 %global pear_name    Horde_Translation
 %global pear_channel pear.horde.org
-
-# Can run test because of circular dependency with Horde_Test
+%if %{bootstrap}
 %global with_tests   %{?_with_tests:1}%{!?_with_tests:0}
+%else
+%global with_tests   %{?_without_tests:0}%{!?_without_tests:1}
+%endif
 
 Name:           php-horde-Horde-Translation
-Version:        2.1.0
-Release:        2%{?dist}
+Version:        2.2.0
+Release:        1%{?dist}
 Summary:        Horde translation library
 
 Group:          Development/Libraries
@@ -53,13 +57,11 @@ Translation wrappers.
 %setup -q -c
 
 cd %{pear_name}-%{version}
-
-# Don't install .po and .pot files
+# Install .po and .pot files, only part of test suite
 # Remove checksum for .mo, as we regenerate them
-sed -e '/%{pear_name}.po/d' \
-    -e '/Horde_Other.po/d' \
-    -e '/%{pear_name}.mo/s/md5sum=.*name=/name=/' \
+sed -e '/%{pear_name}.mo/s/md5sum=.*name=/name=/' \
     ../package.xml >%{name}.xml
+touch -r ../package.xml %{name}.xml
 
 
 %build
@@ -86,10 +88,8 @@ 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
@@ -114,16 +114,14 @@ fi
 %{pear_phpdir}/Horde/Translation
 %{pear_phpdir}/Horde/Translation.php
 %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
+%{pear_testdir}/%{pear_name}
 
 
 %changelog
+* Thu Nov 06 2014 Remi Collet <remi at fedoraproject.org> - 2.2.0-1
+- Update to 2.2.0
+- enable test suite
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
diff --git a/sources b/sources
index c75704c..f6ac3cb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-20d904f7a7ed6b43ee0175f0a98363f9  Horde_Translation-2.1.0.tgz
+f1e2b14120ae8ff319179207234212ab  Horde_Translation-2.2.0.tgz