[php-horde-Horde-Prefs/epel7] update to 2.6.0

[Remi Collet]

commit b91e9fc897000bf41c3a30fdf919dc7eb92c0d5d
Author: Remi Collet <remi at fedoraproject.org>
Date:   Wed May 7 11:00:47 2014 +0200

    update to 2.6.0
    
    (cherry picked from commit c1ca5de79ad2e105af166d7bfc6d6330e619b1d3)

 .gitignore                 |    1 +
 php-horde-Horde-Prefs.spec |   26 ++++++++++++++++++++------
 sources                    |    2 +-
 3 files changed, 22 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f976f33..92b53d2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 /Horde_Prefs-2.5.0.tgz
 /Horde_Prefs-2.5.1.tgz
 /Horde_Prefs-2.5.2.tgz
+/Horde_Prefs-2.6.0.tgz
diff --git a/php-horde-Horde-Prefs.spec b/php-horde-Horde-Prefs.spec
index 82f9101..6e13398 100644
--- a/php-horde-Horde-Prefs.spec
+++ b/php-horde-Horde-Prefs.spec
@@ -1,10 +1,19 @@
+# spec file for php-horde-Horde-Prefs
+#
+# 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}}
-%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
 %global pear_name    Horde_Prefs
 %global pear_channel pear.horde.org
 
 Name:           php-horde-Horde-Prefs
-Version:        2.5.2
+Version:        2.6.0
 Release:        1%{?dist}
 Summary:        Horde Preferences API
 
@@ -44,18 +53,19 @@ Requires:       php-pear(%{pear_channel}/Horde_Util) <  3.0.0
 # Optional
 Requires:       php-pear(%{pear_channel}/Horde_Autoloader) >= 2.0.0
 Requires:       php-pear(%{pear_channel}/Horde_Autoloader) <  3.0.0
+Requires:       php-pear(%{pear_channel}/Horde_Cache) >= 2.0.0
+Requires:       php-pear(%{pear_channel}/Horde_Cache) <  3.0.0
 Requires:       php-pear(%{pear_channel}/Horde_Db) >= 2.0.3
 Requires:       php-pear(%{pear_channel}/Horde_Db) <  3.0.0
 Requires:       php-pear(%{pear_channel}/Horde_Image) >= 2.0.0
 Requires:       php-pear(%{pear_channel}/Horde_Image) <  3.0.0
 Requires:       php-pear(%{pear_channel}/Horde_Ldap) >= 2.0.0
 Requires:       php-pear(%{pear_channel}/Horde_Ldap) <  3.0.0
-#Requires:       php-pear(%{pear_channel}/Horde_Kolab_Storage) >= 2.0.0
-#Requires:       php-pear(%{pear_channel}/Horde_Kolab_Storage) <  3.0.0
+Requires:       php-pear(%{pear_channel}/Horde_Kolab_Storage) >= 2.0.0
+Requires:       php-pear(%{pear_channel}/Horde_Kolab_Storage) <  3.0.0
 Requires:       php-pear(%{pear_channel}/Horde_Imsp) >= 2.0.0
 Requires:       php-pear(%{pear_channel}/Horde_Imsp) <  3.0.0
 # Optional and implicitly required: Horde_Mongo
-# TODO Kolab_Storage (not yet approved)
 
 Provides:       php-pear(%{pear_channel}/%{pear_name}) = %{version}
 
@@ -112,7 +122,7 @@ done | tee ../%{pear_name}.lang
 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 \
     .
 
@@ -141,6 +151,10 @@ fi
 
 
 %changelog
+* Sat May 03 2014 Remi Collet <remi at fedoraproject.org> - 2.6.0-1
+- Update to 2.6.0
+- add optional dep on Horde_Cache and Horde_Kolab_Storage
+
 * Mon Nov 11 2013 Remi Collet <remi at fedoraproject.org> - 2.5.2-1
 - Update to 2.5.2
 
diff --git a/sources b/sources
index 9238fa5..4c65fc5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-777f4104de3fa50fddbb666cb6f01fa8  Horde_Prefs-2.5.2.tgz
+3315c36d7b8f51bf1db19af3e6d16db0  Horde_Prefs-2.6.0.tgz