[php-horde-Horde-Util/epel7] - Update to 2.5.4 - enable the test suite during build

[Remi Collet]

commit bd731a6758457e053365ec9e2366a9772d3af066
Author: Remi Collet <remi at fedoraproject.org>
Date:   Tue Mar 3 14:31:29 2015 +0100

    - Update to 2.5.4
    - enable the test suite during build
    
    (cherry picked from commit 6056d3b7651bd1715b97708604c1619f1dfdaefa)

 .gitignore                |  1 +
 php-horde-Horde-Util.spec | 16 ++++++++++++----
 sources                   |  2 +-
 3 files changed, 14 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 59cf29a..c653ebb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@ clog
 /Horde_Util-2.5.1.tgz
 /Horde_Util-2.5.2.tgz
 /Horde_Util-2.5.3.tgz
+/Horde_Util-2.5.4.tgz
diff --git a/php-horde-Horde-Util.spec b/php-horde-Horde-Util.spec
index 84faea2..8f33f6c 100644
--- a/php-horde-Horde-Util.spec
+++ b/php-horde-Horde-Util.spec
@@ -1,6 +1,6 @@
 # spec file for php-horde-Horde-Util
 #
-# Copyright (c) 2012-2014 Nick Bebout, Remi Collet
+# Copyright (c) 2012-2015 Nick Bebout, Remi Collet
 #
 # License: MIT
 # https://fedoraproject.org/wiki/Licensing:MIT#Modern_Style_with_sublicense
@@ -9,14 +9,17 @@
 #
 %{!?__pear:       %global __pear       %{_bindir}/pear}
 %{!?pear_metadir: %global pear_metadir %{pear_phpdir}}
+%global bootstrap    0
 %global pear_name    Horde_Util
 %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-Util
-Version:        2.5.3
+Version:        2.5.4
 Release:        1%{?dist}
 Summary:        Horde Utility Libraries
 
@@ -89,6 +92,7 @@ install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
 
 %check
 %if %{with_tests}
+export LANG=fr_FR.utf8
 cd %{pear_name}-%{version}/test/$(echo %{pear_name} | sed -e s:_:/:g)
 phpunit .
 %else
@@ -121,6 +125,10 @@ fi
 
 
 %changelog
+* Tue Mar 03 2015 Remi Collet <remi at fedoraproject.org> - 2.5.4-1
+- Update to 2.5.4
+- enable the test suite during build
+
 * Wed Feb 11 2015 Remi Collet <remi at fedoraproject.org> - 2.5.3-1
 - Update to 2.5.3
 - add provides php-composer(horde/horde-util)
diff --git a/sources b/sources
index 362cdd3..e924f41 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-40b48b7b92100867a37a79c33a55203a  Horde_Util-2.5.3.tgz
+61031f32ec7be8e11b995aa9afedc6a2  Horde_Util-2.5.4.tgz