summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2014-11-23 07:43:41 +0100
committerRemi Collet <fedora@famillecollet.com>2014-11-23 07:43:41 +0100
commitd2b6e30c1eba66d96157a7d68ad3630f906b2ea1 (patch)
tree0677a29d673e16dba0118e1af600b540b3ca1cf2
parent1508cc4cd14f87c1cf8d93a596ee71ad340ecb25 (diff)
php-horde-Horde-Mail: 2.5.0
-rw-r--r--php-horde-Horde-Mail.spec21
1 files changed, 14 insertions, 7 deletions
diff --git a/php-horde-Horde-Mail.spec b/php-horde-Horde-Mail.spec
index 12fabe9..ac6c489 100644
--- a/php-horde-Horde-Mail.spec
+++ b/php-horde-Horde-Mail.spec
@@ -15,7 +15,7 @@
%global with_tests %{?_with_tests:1}%{!?_with_tests:0}
Name: php-horde-Horde-Mail
-Version: 2.4.0
+Version: 2.5.0
Release: 1%{?dist}
Summary: Horde Mail Library
@@ -46,6 +46,8 @@ Requires: php-pear(%{pear_channel}/Horde_Mime) >= 2.0.0
Requires: php-pear(%{pear_channel}/Horde_Mime) < 3.0.0
Requires: php-pear(%{pear_channel}/Horde_Stream_Filter) >= 2.0.0
Requires: php-pear(%{pear_channel}/Horde_Stream_Filter) < 3.0.0
+Requires: php-pear(%{pear_channel}/Horde_Translation) >= 2.2.0
+Requires: php-pear(%{pear_channel}/Horde_Translation) < 3.0.0
# From package.xml, optional
Requires: php-pear(Net_SMTP) >= 1.6.0
Requires: php-pear(Net_DNS2)
@@ -76,7 +78,12 @@ things like message redirection pursuant to RFC 5322 [3.6.6]).
%setup -q -c
cd %{pear_name}-%{version}
-cp ../package.xml %{name}.xml
+# Don't install .po and .pot files
+# Remove checksum for .mo, as we regenerate them
+sed -e '/%{pear_name}\.po/d' \
+ -e '/%{pear_name}.mo/s/md5sum=.*name=/name=/' \
+ ../package.xml >%{name}.xml
+touch -r ../package.xml %{name}.xml
%build
@@ -98,12 +105,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 \
- --include-path=$src/lib \
- -d date.timezone=UTC \
- .
+phpunit .
%else
: Test disabled, missing '--with tests' option.
%endif
@@ -129,6 +132,10 @@ fi
%changelog
+* Sun Nov 23 2014 Remi Collet <remi@fedoraproject.org> - 2.5.0-1
+- Update to 2.5.0
+- add dependency on Horde_Translation
+
* Mon Aug 04 2014 Remi Collet <remi@fedoraproject.org> - 2.4.0-1
- Update to 2.4.0