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

[Remi Collet]

commit a52e244ddf2370fa52b3980bd22a81a4072c9b96
Author: Remi Collet <remi at fedoraproject.org>
Date:   Wed May 8 10:35:29 2013 +0200

    update to 2.4.0

 .gitignore                 |    2 ++
 php-horde-Horde-Prefs.spec |   28 ++++++++++++++++++----------
 sources                    |    2 +-
 3 files changed, 21 insertions(+), 11 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index fab1147..bdd0f36 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
+*spec~
 /Horde_Prefs-2.3.2.tgz
+/Horde_Prefs-2.4.0.tgz
diff --git a/php-horde-Horde-Prefs.spec b/php-horde-Horde-Prefs.spec
index abc5e57..fb2c439 100644
--- a/php-horde-Horde-Prefs.spec
+++ b/php-horde-Horde-Prefs.spec
@@ -4,16 +4,17 @@
 %global pear_channel pear.horde.org
 
 Name:           php-horde-Horde-Prefs
-Version:        2.3.2
-Release:        2%{?dist}
+Version:        2.4.0
+Release:        1%{?dist}
 Summary:        Horde Preferences API
 
 Group:          Development/Libraries
 License:        LGPLv2
-URL:            http://pear.horde.org
+URL:            http://%{pear_channel}
 Source0:        http://%{pear_channel}/get/%{pear_name}-%{version}.tgz
 
 BuildArch:      noarch
+BuildRequires:  php(language) >= 5.3.0
 BuildRequires:  php-pear(PEAR) >= 1.7.0
 BuildRequires:  php-channel(%{pear_channel})
 BuildRequires:  gettext
@@ -23,11 +24,11 @@ BuildRequires:  php-pear(%{pear_channel}/Horde_Db) >= 2.0.0
 
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
-Requires:       php-common >= 5.3.0
+Requires:       php(language) >= 5.3.0
 Requires:       php-json
+Requires:       php-pdo
 Requires:       php-pcre
 Requires:       php-spl
-Requires:       php-pdo
 Requires:       php-pear(PEAR) >= 1.7.0
 Requires:       php-channel(%{pear_channel})
 Requires:       php-pear(%{pear_channel}/Horde_Exception) >= 2.0.0
@@ -40,16 +41,18 @@ Requires:       php-pear(%{pear_channel}/Horde_Translation) >= 2.0.0
 Conflicts:      php-pear(%{pear_channel}/Horde_Translation) >= 3.0.0
 Requires:       php-pear(%{pear_channel}/Horde_Util) >= 2.0.0
 Conflicts:      php-pear(%{pear_channel}/Horde_Util) >= 3.0.0
-Requires:       php-pear(%{pear_channel}/Horde_Ldap) >= 2.0.0
-Conflicts:      php-pear(%{pear_channel}/Horde_Ldap) >= 3.0.0
 # Optionnal
 Requires:       php-pear(%{pear_channel}/Horde_Autoloader) >= 2.0.0
 Conflicts:      php-pear(%{pear_channel}/Horde_Autoloader) >= 3.0.0
-Requires:       php-pear(%{pear_channel}/Horde_Db) >= 2.0.0
+Requires:       php-pear(%{pear_channel}/Horde_Db) >= 2.0.3
 Conflicts:      php-pear(%{pear_channel}/Horde_Db) >= 3.0.0
 Requires:       php-pear(%{pear_channel}/Horde_Image) >= 2.0.0
 Conflicts:      php-pear(%{pear_channel}/Horde_Image) >= 3.0.0
-# TODO Horde_Imsp, Kolab_Storage
+Requires:       php-pear(%{pear_channel}/Horde_Ldap) >= 2.0.0
+Conflicts:      php-pear(%{pear_channel}/Horde_Ldap) >= 3.0.0
+Requires:       php-pear(%{pear_channel}/Horde_Imsp) >= 2.0.0
+Conflicts:      php-pear(%{pear_channel}/Horde_Imsp) >= 3.0.0
+# TODO Kolab_Storage
 
 Provides:       php-pear(%{pear_channel}/%{pear_name}) = %{version}
 
@@ -103,9 +106,10 @@ done | tee ../%{pear_name}.lang
 
 
 %check
+src=$(pwd)/%{pear_name}-%{version}
 cd %{pear_name}-%{version}/test/$(echo %{pear_name} | sed -e s:_:/:g)
 phpunit \
-    -d include_path=%{buildroot}%{pear_phpdir}:.:%{pear_phpdir} \
+    -d include_path=$src/lib:.:%{pear_phpdir} \
     -d date.timezone=UTC \
     .
 
@@ -134,6 +138,10 @@ fi
 
 
 %changelog
+* Tue May 07 2013 Remi Collet <remi at fedoraproject.org> - 2.4.0-1
+- Update to 2.4.0
+- raise dependency on Horde_Db >= 2.0.3
+
 * Wed Mar 27 2013 Nick Bebout <nb at fedoraproject.org> - 2.3.2-2
 - Update for review
 
diff --git a/sources b/sources
index 13592f1..6177417 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c091d93d719a3749400881819dae3956  Horde_Prefs-2.3.2.tgz
+ac9d9de16d878c1abc9db14191ffa704  Horde_Prefs-2.4.0.tgz