[php-horde-Horde-Support] update to 2.0.4

[Remi Collet]

commit 7466fef6195edbd38c4981c4d86f152b76017a3f
Author: Remi Collet <remi at fedoraproject.org>
Date:   Wed Mar 6 16:05:07 2013 +0100

    update to 2.0.4

 .gitignore                   |    1 +
 php-horde-Horde-Support.spec |   31 ++++++++++++++++++++-----------
 sources                      |    2 +-
 3 files changed, 22 insertions(+), 12 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 71bfb53..6f72567 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /Horde_Support-1.0.2.tgz
 /Horde_Support-2.0.2.tgz
 /Horde_Support-2.0.3.tgz
+/Horde_Support-2.0.4.tgz
diff --git a/php-horde-Horde-Support.spec b/php-horde-Horde-Support.spec
index 2f0d169..a5a3f76 100644
--- a/php-horde-Horde-Support.spec
+++ b/php-horde-Horde-Support.spec
@@ -7,7 +7,7 @@
 %global with_tests   %{?_with_tests:1}%{!?_with_tests:0}
 
 Name:           php-horde-Horde-Support
-Version:        2.0.3
+Version:        2.0.4
 Release:        1%{?dist}
 Summary:        Horde support package
 
@@ -17,6 +17,7 @@ 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,14 @@ BuildRequires:  php-pear(%{pear_channel}/Horde_Test) >= 2.1.0
 
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
-Requires:       php-pear(%{pear_channel}/Horde_Exception) >= 2.0.0
-Requires:       php-pear(%{pear_channel}/Horde_Stream_Wrapper) >= 2.0.0
+Requires:       php-common >= 5.3.0
+Requires:       php-date
+Requires:       php-pcre
+Requires:       php-spl
 Requires:       php-pear(PEAR) >= 1.7.0
 Requires:       php-channel(%{pear_channel})
-Requires:       php-common >= 5.3.0
-Requires:       php-date php-pcre php-spl
+Requires:       php-pear(%{pear_channel}/Horde_Exception) >= 2.0.0
+Requires:       php-pear(%{pear_channel}/Horde_Stream_Wrapper) >= 2.0.0
 
 Provides:       php-pear(%{pear_channel}/%{pear_name}) = %{version}
 
@@ -41,25 +44,26 @@ used outside of Horde as well.
 
 %prep
 %setup -q -c
-[ -f package2.xml ] || mv package.xml package2.xml
-mv package2.xml %{pear_name}-%{version}/%{name}.xml
 
 cd %{pear_name}-%{version}
+cp ../package.xml %{name}.xml
+
 
 %build
 cd %{pear_name}-%{version}
 # Empty build section, most likely nothing required.
 
+
 %install
 cd %{pear_name}-%{version}
-%{__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
@@ -84,13 +88,18 @@ if [ $1 -eq 0 ] ; then
         %{pear_channel}/%{pear_name} >/dev/null || :
 fi
 
+
 %files
 %doc %{pear_docdir}/%{pear_name}
 %{pear_xmldir}/%{name}.xml
 %{pear_phpdir}/Horde/Support
 %{pear_testdir}/%{pear_name}
 
+
 %changelog
+* Wed Mar 06 2013 Remi Collet <remi at fedoraproject.org> - 2.0.4-1
+- Update to 2.0.4
+
 * Wed Jan 30 2013 Remi Collet <remi at fedoraproject.org> - 2.0.3-1
 - Update to 2.0.3
 - add option to run tests
diff --git a/sources b/sources
index 5f90577..320a21b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ba00ca9071309459030d7cf7f8f35633  Horde_Support-2.0.3.tgz
+c790cf1863f559671aa0bcc9d3fc7c99  Horde_Support-2.0.4.tgz