[php-horde-Horde-Mail] update to 2.5.0

[Remi Collet]

commit 8c5dbcdccd04b3adface2e48d6bed2bc315424b8
Author: Remi Collet <remi at fedoraproject.org>
Date:   Sun Nov 23 08:48:44 2014 +0100

    update to 2.5.0

 .gitignore                |    1 +
 php-horde-Horde-Mail.spec |   21 ++++++++++++++-------
 sources                   |    2 +-
 3 files changed, 16 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b3e668c..eb2ccc9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@
 /Horde_Mail-2.2.0.tgz
 /Horde_Mail-2.3.0.tgz
 /Horde_Mail-2.4.0.tgz
+/Horde_Mail-2.5.0.tgz
diff --git a/php-horde-Horde-Mail.spec b/php-horde-Horde-Mail.spec
index d0fd5b6..2fd65b8 100644
--- a/php-horde-Horde-Mail.spec
+++ b/php-horde-Horde-Mail.spec
@@ -16,7 +16,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
@@ -128,6 +131,10 @@ fi
 
 
 %changelog
+* Sun Nov 23 2014 Remi Collet <remi at fedoraproject.org> - 2.5.0-1
+- Update to 2.5.0
+- add dependency on Horde_Translation
+
 * Mon Aug 04 2014 Remi Collet <remi at fedoraproject.org> - 2.4.0-1
 - Update to 2.4.0
 
diff --git a/sources b/sources
index 2af9ff0..94c1bdd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-95a15b6440568cc24fdbc136e6fa381c  Horde_Mail-2.4.0.tgz
+4823e2eb8de1a831e98c20388bba011f  Horde_Mail-2.5.0.tgz