Update php-horde-Horde-* to 2.0.0

1 files changed, 25 insertions, 22 deletions

diff --git a/php-horde-Horde-Support.spec b/php-horde-Horde-Support.spec
index 16f94e1..72eb7f9 100644
--- a/php-horde-Horde-Support.spec
+++ b/php-horde-Horde-Support.spec
@@ -1,9 +1,11 @@
+%{!?pear_metadir: %global pear_metadir %{pear_phpdir}}
 %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
-%global pear_name Horde_Support
+%global pear_name    Horde_Support
+%global pear_channel pear.horde.org
 
 Name:           php-horde-Horde-Support
-Version:        1.0.2
-Release:        3%{?dist}
+Version:        2.0.0
+Release:        1%{?dist}
 Summary:        Horde support package
 
 Group:          Development/Libraries
@@ -14,33 +16,31 @@ Source0:        http://pear.horde.org/get/%{pear_name}-%{version}.tgz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch:      noarch
 BuildRequires:  php-pear(PEAR) >= 1.7.0
-BuildRequires:  php-channel(pear.horde.org)
+BuildRequires:  php-channel(%{pear_channel})
 
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
-Requires:       php-pear(pear.horde.org/Horde_Exception) < 2.0.0
-Requires:       php-pear(pear.horde.org/Horde_Stream_Wrapper) < 2.0.0
-Requires:       php-pear(PEAR) >= 1.7.0
-Requires:       php-channel(pear.horde.org)
-Requires:       php-common >= 5.2.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_Stream_Wrapper) >= 2.0.0
+Conflicts:      php-pear(%{pear_channel}/Horde_Stream_Wrapper) >= 3.0.0
+Requires:       php(language) >= 5.3.0
+Requires:       php-channel(%{pear_channel})
 Requires:       php-date php-pcre php-spl
 
-Provides:       php-pear(pear.horde.org/%{pear_name}) = %{version}
+Provides:       php-pear(%{pear_channel}/%{pear_name}) = %{version}
 
 %description
 Support classes not tied to Horde but is used by it. These classes can be
 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
-
-# Create a "localized" php.ini to avoid build warning
-cp /etc/php.ini .
-echo "date.timezone=UTC" >>php.ini
+%setup -q -c -T
+tar xif %{SOURCE0}
 
 cd %{pear_name}-%{version}
+mv ../package.xml %{name}.xml
+
 
 %build
 cd %{pear_name}-%{version}
@@ -48,14 +48,14 @@ cd %{pear_name}-%{version}
 
 %install
 cd %{pear_name}-%{version}
-PHPRC=../php.ini %{__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_phpdir}/.??*
+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}
 
 %post
 %{__pear} install --nodeps --soft --force --register-only \
@@ -64,7 +64,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
@@ -75,6 +75,9 @@ fi
 %{pear_testdir}/%{pear_name}
 
 %changelog
+* Thu Nov  1 2012 Remi Collet <RPMS@FamilleCollet.com> - 2.0.0-1
+- Update to 2.0.0 for remi repo
+
 * Tue Aug 14 2012 Remi Collet <remi@fedoraproject.org> - 1.0.2-3
 - rebuilt for new pear_testdir