From fa30dcc23f1fd833c6f49ff88b149f512febf87f Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 1 Nov 2012 12:33:27 +0100 Subject: Update php-horde-Horde-* to 2.0.0 --- php-horde-Horde-Autoloader.spec | 41 +++++++++++++++++++++++++---------------- 1 file changed, 25 insertions(+), 16 deletions(-) diff --git a/php-horde-Horde-Autoloader.spec b/php-horde-Horde-Autoloader.spec index 3d97782..c3ebe97 100644 --- a/php-horde-Horde-Autoloader.spec +++ b/php-horde-Horde-Autoloader.spec @@ -1,9 +1,11 @@ +%{!?pear_metadir: %global pear_metadir %{pear_phpdir}} %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}} -%global pear_name Horde_Autoloader +%global pear_name Horde_Autoloader +%global pear_channel pear.horde.org Name: php-horde-Horde-Autoloader -Version: 1.0.1 -Release: 3%{?dist} +Version: 2.0.0 +Release: 1%{?dist} Summary: Horde Autoloader Group: Development/Libraries @@ -13,22 +15,26 @@ Source0: http://pear.horde.org/get/%{pear_name}-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildArch: noarch -BuildRequires: php-pear >= 1:1.4.9-1.2 +BuildRequires: php-pear +BuildRequires: php-channel(%{pear_channel}) + Requires(post): %{__pear} Requires(postun): %{__pear} -Provides: php-pear(pear.horde.org/Horde_Autoloader) = %{version} -BuildRequires: php-channel(pear.horde.org) -Requires: php-channel(pear.horde.org) +Requires: php(language) >= 5.3.0 +Requires: php-channel(%{pear_channel}) + +Provides: php-pear(%{pear_channel}/Horde_Autoloader) = %{version} + %description Autoload implementation and class loading manager for Horde. %prep -%setup -q -c -[ -f package2.xml ] || mv package.xml package2.xml -mv package2.xml %{pear_name}-%{version}/%{name}.xml +%setup -q -c -T +tar xif %{SOURCE0} cd %{pear_name}-%{version} +mv ../package.xml %{name}.xml %build @@ -38,15 +44,15 @@ cd %{pear_name}-%{version} %install cd %{pear_name}-%{version} -rm -rf $RPM_BUILD_ROOT -%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml +rm -rf %{buildroot} +%{__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 \ @@ -55,7 +61,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 @@ -67,6 +73,9 @@ fi %{pear_testdir}/Horde_Autoloader %changelog +* Thu Nov 1 2012 Remi Collet - 2.0.0-1 +- Update to 2.0.0 for remi repo + * Tue Aug 14 2012 Remi Collet - 1.0.1-3 - rebuilt for new pear_testdir -- cgit