php-horde-Horde-Translation: 2.2.0

1 files changed, 15 insertions, 17 deletions

diff --git a/php-horde-Horde-Translation.spec b/php-horde-Horde-Translation.spec
index 89cce8d..19a590f 100644
--- a/php-horde-Horde-Translation.spec
+++ b/php-horde-Horde-Translation.spec
@@ -8,14 +8,18 @@
 # Please, preserve the changelog entries
 #
 %{!?__pear:       %global __pear       %{_bindir}/pear}
+# 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
+Version:        2.2.0
 Release:        1%{?dist}
 Summary:        Horde translation library
 
@@ -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
@@ -115,16 +115,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@fedoraproject.org> - 2.2.0-1
+- Update to 2.2.0
+- enable test suite
+
 * Tue Feb 11 2014 Remi Collet <remi@fedoraproject.org> - 2.1.0-1
 - Update to 2.1.0