summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2013-01-15 15:25:10 +0100
committerRemi Collet <fedora@famillecollet.com>2013-01-15 15:25:10 +0100
commitfd0015ca4900b298e9fdefc0370c1e52a3515fc8 (patch)
tree3de8d8e2c73799756d4260a7f9063221a3733536
parent0a05e18613f9e860c6eff01b473b3822259a882b (diff)
php-horde-Horde-Translation: revert previous et fix include_path
-rw-r--r--php-horde-Horde-Translation.spec9
1 files changed, 3 insertions, 6 deletions
diff --git a/php-horde-Horde-Translation.spec b/php-horde-Horde-Translation.spec
index 312deac..d52fd08 100644
--- a/php-horde-Horde-Translation.spec
+++ b/php-horde-Horde-Translation.spec
@@ -49,15 +49,12 @@ tar xif %{SOURCE0}
cd %{pear_name}-%{version}
-%patch0 -p3 -b .old
-
# Don't install .po and .pot files
# Remove checksum for .mo, as we regenerate them
# Remove checksum for patched files
sed -e '/%{pear_name}.po/d' \
-e '/Horde_Other.po/d' \
-e '/%{pear_name}.mo/s/md5sum=.*name=/name=/' \
- -e '/Gettext.php/s/md5sum=.*name=/name=/' \
../package.xml >%{name}.xml
@@ -85,9 +82,10 @@ 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=%{buildroot}%{pear_phpdir}:.:%{pear_phpdir} \
+ -d include_path=$src/lib:.:%{pear_phpdir} \
-d date.timezone=UTC \
.
%else
@@ -124,8 +122,7 @@ fi
%changelog
* Tue Jan 15 2013 Remi Collet <remi@fedoraproject.org> - 2.0.1-2
-- patch for http://bugs.horde.org/ticket/11958
- Allow to run unit tests for a not installed component
+- fix include_path for tests
* Mon Nov 19 2012 Remi Collet <RPMS@FamilleCollet.com> - 2.0.1-1
- Update to 2.0.1 for remi repo