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

[Remi Collet]

commit e42afae734b283965ac159ccfa08958ec21f093b
Author: Remi Collet <remi at fedoraproject.org>
Date:   Wed Jan 30 07:19:47 2013 +0100

    update to 2.1.0

 .gitignore               |    1 +
 php-horde-Horde-Url.spec |   45 +++++++++++++++++++++++++++++++++++----------
 sources                  |    2 +-
 3 files changed, 37 insertions(+), 11 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ab3a4db..49aeb26 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /Horde_Url-1.0.0.tgz
 /Horde_Url-1.0.2.tgz
 /Horde_Url-2.0.1.tgz
+/Horde_Url-2.1.0.tgz
diff --git a/php-horde-Horde-Url.spec b/php-horde-Horde-Url.spec
index cde9921..2798d44 100644
--- a/php-horde-Horde-Url.spec
+++ b/php-horde-Horde-Url.spec
@@ -1,29 +1,37 @@
 %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
 %{!?pear_metadir: %global pear_metadir %{pear_phpdir}}
-%global pear_name Horde_Url
+%global pear_name    Horde_Url
+%global pear_channel pear.horde.org
+
+# Can run test because of circular dependency with Horde_Test
+%global with_tests   %{?_with_tests:1}%{!?_with_tests:0}
 
 Name:           php-horde-Horde-Url
-Version:        2.0.1
+Version:        2.1.0
 Release:        1%{?dist}
 Summary:        Horde Url class
 
 Group:          Development/Libraries
 License:        LGPLv2+
-URL:            http://pear.horde.org
-Source0:        http://pear.horde.org/get/%{pear_name}-%{version}.tgz
+URL:            http://%{pear_channel}
+Source0:        http://%{pear_channel}/get/%{pear_name}-%{version}.tgz
 
 BuildArch:      noarch
 BuildRequires:  php-pear(PEAR) >= 1.7.0
-BuildRequires:  php-channel(pear.horde.org)
+BuildRequires:  php-channel(%{pear_channel})
+%if %{with_tests}
+# To run unit tests
+BuildRequires:  php-pear(%{pear_channel}/Horde_Test) >= 2.1.0
+%endif
 
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
-Requires:       php-pear(pear.horde.org/Horde_Exception) >= 2.0.0
-Requires:       php-pear(pear.horde.org/Horde_Exception) < 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) >= 1.7.0
 Requires:       php-common >= 5.3.0
-Provides:       php-pear(pear.horde.org/%{pear_name}) = %{version}
-Requires:       php-channel(pear.horde.org)
+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
@@ -52,6 +60,19 @@ rm -rf $RPM_BUILD_ROOT%{pear_metadir}/.??*
 mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
 install -pm 644 %{name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
 
+
+%check
+%if %{with_tests}
+cd %{pear_name}-%{version}/test/$(echo %{pear_name} | sed -e s:_:/:g)
+phpunit\
+    -d include_path=%{buildroot}%{pear_phpdir}:.:%{pear_phpdir} \
+    -d date.timezone=UTC \
+    .
+%else
+: Test disabled, missing '--with tests' option.
+%endif
+
+
 %post
 %{__pear} install --nodeps --soft --force --register-only \
     %{pear_xmldir}/%{name}.xml >/dev/null || :
@@ -59,7 +80,7 @@ install -pm 644 %{name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
 %postun
 if [ $1 -eq 0 ] ; then
     %{__pear} uninstall --nodeps --ignore-errors --register-only \
-        pear.horde.org/%{pear_name} >/dev/null || :
+        %{pear_channel}/%{pear_name} >/dev/null || :
 fi
 
 %files
@@ -70,6 +91,10 @@ fi
 %{pear_docdir}/Horde_Url
 
 %changelog
+* Wed Jan 30 2013 Remi Collet <remi at fedoraproject.org> - 2.1.0-1
+- Update to 2.1.0
+- add option to run tests
+
 * Wed Dec 12 2012 Nick Bebout <nb at fedoraproject.org> - 2.0.1-1
 - Update to 2.0.1
 
diff --git a/sources b/sources
index 3d10070..f783bb3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f973db45aee56e156814954729e18f23  Horde_Url-2.0.1.tgz
+9a12c61115e2068b4a23a444082d4672  Horde_Url-2.1.0.tgz