[php-horde-Horde-Perms] update to 2.1.1

[Remi Collet]

commit b641bb8971d7986a8248dea864b0b17a4c77aa56
Author: Remi Collet <remi at fedoraproject.org>
Date:   Tue Aug 27 14:59:43 2013 +0200

    update to 2.1.1

 .gitignore                 |    3 +++
 php-horde-Horde-Perms.spec |   25 +++++++++++++++----------
 sources                    |    2 +-
 3 files changed, 19 insertions(+), 11 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c1ef7ad..2926411 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,4 @@
+clog
+*spec~
 /Horde_Perms-2.1.0.tgz
+/Horde_Perms-2.1.1.tgz
diff --git a/php-horde-Horde-Perms.spec b/php-horde-Horde-Perms.spec
index cf20942..7a7dbfa 100644
--- a/php-horde-Horde-Perms.spec
+++ b/php-horde-Horde-Perms.spec
@@ -4,8 +4,8 @@
 %global pear_channel pear.horde.org
 
 Name:           php-horde-Horde-Perms
-Version:        2.1.0
-Release:        2%{?dist}
+Version:        2.1.1
+Release:        1%{?dist}
 Summary:        Horde Permissions System
 
 Group:          Development/Libraries
@@ -14,6 +14,7 @@ URL:            http://pear.horde.org
 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,23 +24,23 @@ BuildRequires:  php-pear(%{pear_channel}/Horde_Group) >= 2.0.0
 
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
-Requires:       php-common >= 5.3.0
+Requires:       php(language) >= 5.3.0
 Requires:       php-spl
 Requires:       php-pear(PEAR) >= 1.7.0
 Requires:       php-channel(%{pear_channel})
 Requires:       php-pear(%{pear_channel}/Horde_Db) >= 2.0.0
-Conflicts:      php-pear(%{pear_channel}/Horde_Db) >= 3.0.0
+Requires:       php-pear(%{pear_channel}/Horde_Db) <  3.0.0
 Requires:       php-pear(%{pear_channel}/Horde_Exception) >= 2.0.0
-Conflicts:      php-pear(%{pear_channel}/Horde_Exception) >= 3.0.0
+Requires:       php-pear(%{pear_channel}/Horde_Exception) <  3.0.0
 Requires:       php-pear(%{pear_channel}/Horde_Group) >= 2.0.0
-Conflicts:      php-pear(%{pear_channel}/Horde_Group) >= 3.0.0
+Requires:       php-pear(%{pear_channel}/Horde_Group) <  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_Util) <  3.0.0
 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_Translation) <  3.0.0
 # Optionnal
 Requires:       php-pear(%{pear_channel}/Horde_Tree) >= 2.0.0
-Conflicts:      php-pear(%{pear_channel}/Horde_Tree) >= 3.0.0
+Requires:       php-pear(%{pear_channel}/Horde_Tree) <  3.0.0
 
 Provides:       php-pear(%{pear_channel}/%{pear_name}) = %{version}
 
@@ -90,9 +91,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 \
     .
 
@@ -120,6 +122,9 @@ fi
 
 
 %changelog
+* Tue Aug 27 2013 Remi Collet <remi at fedoraproject.org> - 2.1.1-1
+- Update to 2.1.1
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
diff --git a/sources b/sources
index 67bb347..af9e4bc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-99212918a34b291ae4d25c53abd2c042  Horde_Perms-2.1.0.tgz
+8628508c72109e9a1d40c7f43d6270e1  Horde_Perms-2.1.1.tgz