[php-horde-Horde-Util] update to 2.4.0

[Remi Collet]

commit c11c11e09bcdadb5e35edcb206d9bd1ec0424dfc
Author: Remi Collet <remi at fedoraproject.org>
Date:   Wed May 7 08:34:07 2014 +0200

    update to 2.4.0

 .gitignore                |    1 +
 php-horde-Horde-Util.spec |   36 +++++++++++++++++++++++++++---------
 sources                   |    2 +-
 3 files changed, 29 insertions(+), 10 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a52b2ff..affd147 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@ clog
 /Horde_Util-2.2.1.tgz
 /Horde_Util-2.2.2.tgz
 /Horde_Util-2.3.0.tgz
+/Horde_Util-2.4.0.tgz
diff --git a/php-horde-Horde-Util.spec b/php-horde-Horde-Util.spec
index 63967bb..d2bb824 100644
--- a/php-horde-Horde-Util.spec
+++ b/php-horde-Horde-Util.spec
@@ -1,4 +1,13 @@
-%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
+# spec file for php-horde-Horde-Util
+#
+# Copyright (c) 2012-2014 Nick Bebout, Remi Collet
+#
+# License: MIT
+# https://fedoraproject.org/wiki/Licensing:MIT#Modern_Style_with_sublicense
+#
+# Please, preserve the changelog entries
+#
+%{!?__pear:       %global __pear       %{_bindir}/pear}
 %{!?pear_metadir: %global pear_metadir %{pear_phpdir}}
 %global pear_name    Horde_Util
 %global pear_channel pear.horde.org
@@ -7,8 +16,8 @@
 %global with_tests   %{?_with_tests:1}%{!?_with_tests:0}
 
 Name:           php-horde-Horde-Util
-Version:        2.3.0
-Release:        2%{?dist}
+Version:        2.4.0
+Release:        1%{?dist}
 Summary:        Horde Utility Libraries
 
 Group:          Development/Libraries
@@ -27,20 +36,25 @@ BuildRequires:  php-pear(%{pear_channel}/Horde_Test) >= 2.1.0
 
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
+# From package.xml
 Requires:       php(language) >= 5.3.0
+Requires:       php-pear(PEAR) >= 1.7.0
+Requires:       php-channel(%{pear_channel})
+# Optional
 Requires:       php-ctype
-Requires:       php-dom
 Requires:       php-filter
 Requires:       php-iconv
+Requires:       php-intl
 Requires:       php-json
-Requires:       php-libxml
 Requires:       php-mbstring
+Requires:       php-xml
+# From phpcompatinfo report for version 2.4.0
+Requires:       php-dom
+Requires:       php-libxml
 Requires:       php-pcre
 Requires:       php-session
 Requires:       php-spl
-Requires:       php-pear(PEAR) >= 1.7.0
-Requires:       php-channel(%{pear_channel})
-# Optionnal: Horde_Imap_Client not required to reduce build tree
+# Optional: Horde_Imap_Client not required to reduce build tree
 
 Provides:       php-pear(%{pear_channel}/%{pear_name}) = %{version}
 
@@ -77,7 +91,7 @@ install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
 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} \
+    --include-path=$src/lib \
     -d date.timezone=UTC \
     .
 %else
@@ -103,12 +117,16 @@ fi
 %{pear_phpdir}/Horde/Array.php
 %{pear_phpdir}/Horde/Domhtml.php
 %{pear_phpdir}/Horde/String.php
+%{pear_phpdir}/Horde/String
 %{pear_phpdir}/Horde/Util.php
 %{pear_phpdir}/Horde/Variables.php
 %{pear_testdir}/%{pear_name}
 
 
 %changelog
+* Sat May 03 2014 Remi Collet <remi at fedoraproject.org> - 2.4.0-1
+- Update to 2.4.0
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.3.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
diff --git a/sources b/sources
index 938dc6b..7fbb54b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8dcee29e8782e65085d4fe896097ce6c  Horde_Util-2.3.0.tgz
+ccec1dfcbef7b61ff3dbb93410c7933c  Horde_Util-2.4.0.tgz