[php-horde-Horde-Exception] - Update to 2.0.3 - run test when build --with tests - spec cleanups - fix License

[Remi Collet]

commit 54e2edbe083b27866d54495ec15b250e85dddbeb
Author: Remi Collet <remi at fedoraproject.org>
Date:   Tue Feb 12 08:30:08 2013 +0100

    - Update to 2.0.3
    - run test when build --with tests
    - spec cleanups
    - fix License

 .gitignore                     |    3 +
 php-horde-Horde-Exception.spec |   80 ++++++++++++++++++++++++++++-----------
 sources                        |    2 +-
 3 files changed, 61 insertions(+), 24 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f0f9e2d..c08e42a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,7 @@
+clog
+*spec~
 /Horde_Exception-1.0.8.tgz
 /Horde_Exception-1.0.9.tgz
 /Horde_Exception-2.0.1.tgz
 /Horde_Exception-2.0.2.tgz
+/Horde_Exception-2.0.3.tgz
diff --git a/php-horde-Horde-Exception.spec b/php-horde-Horde-Exception.spec
index 85b78b4..1389be9 100644
--- a/php-horde-Horde-Exception.spec
+++ b/php-horde-Horde-Exception.spec
@@ -1,35 +1,51 @@
 %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
 %{!?pear_metadir: %global pear_metadir %{pear_phpdir}}
-%global pear_name Horde_Exception
+%global pear_name    Horde_Exception
+%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-Exception
-Version:        2.0.2
+Version:        2.0.3
 Release:        1%{?dist}
 Summary:        Horde Exception Handler
 
 Group:          Development/Libraries
-License:        LGPLv2+
-URL:            http://pear.horde.org
-Source0:        http://pear.horde.org/get/%{pear_name}-%{version}.tgz
+License:        LGPLv2
+URL:            http://%{pear_channel}
+Source0:        http://%{pear_channel}/get/%{pear_name}-%{version}.tgz
 
 BuildArch:      noarch
+BuildRequires:  gettext
+BuildRequires:  php-common >= 5.3.0
 BuildRequires:  php-pear(PEAR) >= 1.7.0
-Requires:       php-common >= 5.3.0
+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_Translation) < 3.0.0
-Requires:       php-pear(pear.horde.org/Horde_Translation) >= 2.0.0
+Requires:       php-common >= 5.3.0
+Requires:       php-spl
 Requires:       php-pear(PEAR) >= 1.7.0
-Provides:       php-pear(pear.horde.org/Horde_Exception) = %{version}
-BuildRequires:  php-channel(pear.horde.org) gettext
-Requires:       php-channel(pear.horde.org)
+Requires:       php-channel(%{pear_channel})
+Requires:       php-pear(%{pear_channel}/Horde_Translation) >= 2.0.0
+Conflicts:      php-pear(%{pear_channel}/Horde_Translation) >= 3.0.0
+
+Provides:       php-pear(%{pear_channel}/%{pear_name}) = %{version}
+
 
 %description
 This class provides the default exception handlers for the Horde
 Application Framework.
 
+
 %prep
 %setup -q -c
+
 cd %{pear_name}-%{version}
 
 # Don't install .po and .pot files
@@ -38,6 +54,7 @@ sed -e '/%{pear_name}.po/d' \
     -e '/%{pear_name}.mo/s/md5sum=.*name=/name=/' \
     ../package.xml >%{name}.xml
 
+
 %build
 cd %{pear_name}-%{version}
 # Empty build section, most likely nothing required.
@@ -48,17 +65,17 @@ do
    msgfmt $po -o $(dirname $po)/$(basename $po .po).mo
 done
 
+
 %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}
 
 # Locales
 for loc in locale/{??,??_??}
@@ -67,6 +84,20 @@ do
     test -d $loc && echo "%%lang(${lang%_*}) %{pear_datadir}/%{pear_name}/$loc"
 done | tee ../%{pear_name}.lang
 
+
+%check
+%if %{with_tests}
+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} \
+    -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 || :
@@ -74,7 +105,7 @@ done | tee ../%{pear_name}.lang
 %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
 
 
@@ -83,14 +114,17 @@ fi
 %{pear_xmldir}/%{name}.xml
 %{pear_phpdir}/Horde/Exception
 %{pear_phpdir}/Horde/Exception.php
-# own locales (non standard) directories, .mo own by find_lang
-%dir %{pear_datadir}/Horde_Exception
-%dir %{pear_datadir}/Horde_Exception/locale
-%dir %{pear_datadir}/Horde_Exception/locale/*
-%dir %{pear_datadir}/Horde_Exception/locale/*/LC_MESSAGES
-%{pear_testdir}/Horde_Exception
+%dir %{pear_datadir}/%{pear_name}
+%dir %{pear_datadir}/%{pear_name}/locale
+%{pear_testdir}/%{pear_name}
 
 %changelog
+* Mon Feb 11 2013 Remi Collet <remi at fedoraproject.org> - 2.0.3-1
+- Update to 2.0.3
+- run test when build --with tests
+- spec cleanups
+- fix License
+
 * Fri Jan 11 2013 Nick Bebout <nb at fedoraproject.org> - 2.0.2-1
 - Update to 2.0.2
 
diff --git a/sources b/sources
index edf924c..db54bb5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a33e9344c2e89443e3a50cdebc4d4cea  Horde_Exception-2.0.2.tgz
+8f88f9709f3838660ffcb2fb91eb240b  Horde_Exception-2.0.3.tgz