[php-horde-Horde-Url] update to 2.2.0

[Remi Collet]

commit 3ab3c1b56a9360955a0da1a6601201c71ce50834
Author: Remi Collet <remi at fedoraproject.org>
Date:   Wed Mar 6 16:17:40 2013 +0100

    update to 2.2.0

 .gitignore               |    1 +
 php-horde-Horde-Url.spec |   34 +++++++++++++++++++++-------------
 sources                  |    2 +-
 3 files changed, 23 insertions(+), 14 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 49aeb26..34083c7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /Horde_Url-1.0.2.tgz
 /Horde_Url-2.0.1.tgz
 /Horde_Url-2.1.0.tgz
+/Horde_Url-2.2.0.tgz
diff --git a/php-horde-Horde-Url.spec b/php-horde-Horde-Url.spec
index 2798d44..6145eee 100644
--- a/php-horde-Horde-Url.spec
+++ b/php-horde-Horde-Url.spec
@@ -7,16 +7,17 @@
 %global with_tests   %{?_with_tests:1}%{!?_with_tests:0}
 
 Name:           php-horde-Horde-Url
-Version:        2.1.0
+Version:        2.2.0
 Release:        1%{?dist}
 Summary:        Horde Url class
 
 Group:          Development/Libraries
-License:        LGPLv2+
+License:        LGPLv2
 URL:            http://%{pear_channel}
 Source0:        http://%{pear_channel}/get/%{pear_name}-%{version}.tgz
 
 BuildArch:      noarch
+BuildRequires:  php-common >= 5.3.0
 BuildRequires:  php-pear(PEAR) >= 1.7.0
 BuildRequires:  php-channel(%{pear_channel})
 %if %{with_tests}
@@ -26,12 +27,15 @@ BuildRequires:  php-pear(%{pear_channel}/Horde_Test) >= 2.1.0
 
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
+Requires:       php-common >= 5.3.0
+Requires:       php-pcre
+Requires:       php-pear(PEAR) >= 1.7.0
+Requires:       php-channel(%{pear_channel})
 Requires:       php-pear(%{pear_channel}/Horde_Exception) >= 2.0.0
 Conflicts:      php-pear(%{pear_channel}/Horde_Exception) >= 3.0.0
-Requires:       php-pear(PEAR) >= 1.7.0
-Requires:       php-common >= 5.3.0
+
 Provides:       php-pear(%{pear_channel}/%{pear_name}) = %{version}
-Requires:       php-channel(%{pear_channel})
+
 
 %description
 This class represents a single URL and provides methods for manipulating
@@ -39,10 +43,10 @@ URLs.
 
 %prep
 %setup -q -c
-[ -f package2.xml ] || mv package.xml package2.xml
-mv package2.xml %{pear_name}-%{version}/%{name}.xml
 
 cd %{pear_name}-%{version}
+mv ../package.xml %{name}.xml
+
 
 %build
 cd %{pear_name}-%{version}
@@ -50,15 +54,14 @@ cd %{pear_name}-%{version}
 
 %install
 cd %{pear_name}-%{version}
-rm -rf $RPM_BUILD_ROOT
-%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml
+%{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml
 
 # Clean up unnecessary files
-rm -rf $RPM_BUILD_ROOT%{pear_metadir}/.??*
+rm -rf %{buildroot}%{pear_metadir}/.??*
 
 # Install XML package description
-mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
-install -pm 644 %{name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
+mkdir -p %{buildroot}%{pear_xmldir}
+install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
 
 
 %check
@@ -88,9 +91,14 @@ fi
 %{pear_phpdir}/Horde/Url
 %{pear_phpdir}/Horde/Url.php
 %{pear_testdir}/Horde_Url
-%{pear_docdir}/Horde_Url
+%doc %{pear_docdir}/Horde_Url
+
 
 %changelog
+* Wed Mar 06 2013 Remi Collet <remi at fedoraproject.org> - 2.2.0-1
+- Update to 2.2.0
+- fix License
+
 * Wed Jan 30 2013 Remi Collet <remi at fedoraproject.org> - 2.1.0-1
 - Update to 2.1.0
 - add option to run tests
diff --git a/sources b/sources
index f783bb3..4f60dad 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9a12c61115e2068b4a23a444082d4672  Horde_Url-2.1.0.tgz
+66d5fc1b095f0a5d5427d11165358b62  Horde_Url-2.2.0.tgz