From 52a02f1f8716ca3d52174821af4b980bfc1845b1 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-Translation.spec | 44 +++++++++++++++++++++++----------------- 1 file changed, 25 insertions(+), 19 deletions(-) diff --git a/php-horde-Horde-Translation.spec b/php-horde-Horde-Translation.spec index de66970..6d64c29 100644 --- a/php-horde-Horde-Translation.spec +++ b/php-horde-Horde-Translation.spec @@ -1,9 +1,11 @@ +%{!?pear_metadir: %global pear_metadir %{pear_phpdir}} %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}} -%global pear_name Horde_Translation +%global pear_name Horde_Translation +%global pear_channel pear.horde.org Name: php-horde-Horde-Translation -Version: 1.0.2 -Release: 3%{?dist} +Version: 2.0.0 +Release: 1%{?dist} Summary: Horde translation library Group: Development/Libraries @@ -15,24 +17,25 @@ Source1: find-lang.sh BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildArch: noarch -BuildRequires: php-pear(PEAR) >= 1.7.0 -BuildRequires: php-channel(pear.horde.org) +BuildRequires: php-pear +BuildRequires: php-channel(%{pear_channel}) BuildRequires: gettext Requires(post): %{__pear} Requires(postun): %{__pear} -Requires: php-channel(pear.horde.org) -Requires: php-common >= 5.2.0 -Requires: php-pear(PEAR) >= 1.7.0 +Requires: php-channel(%{pear_channel}) +Requires: php(language) >= 5.3.0 -Provides: php-pear(pear.horde.org/Horde_Translation) = %{version} +Provides: php-pear(%{pear_channel}/Horde_Translation) = %{version} %description Translation wrappers. %prep -%setup -q -c +%setup -q -c -T +tar xif %{SOURCE0} + cd %{pear_name}-%{version} # Don't install .po and .pot files @@ -52,29 +55,29 @@ do done %install +rm -rf %{buildroot} 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_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} %if 0%{?fedora} > 13 %find_lang %{pear_name} %find_lang Horde_Other %else -sh %{SOURCE1} $RPM_BUILD_ROOT %{pear_name} -sh %{SOURCE1} $RPM_BUILD_ROOT Horde_Other +sh %{SOURCE1} %{buildroot} %{pear_name} +sh %{SOURCE1} %{buildroot} Horde_Other %endif cat Horde_Other.lang >> %{pear_name}.lang cat %{pear_name}.lang %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %post %{__pear} install --nodeps --soft --force --register-only \ @@ -83,7 +86,7 @@ rm -rf $RPM_BUILD_ROOT %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 @@ -106,6 +109,9 @@ fi %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.2-3 - rebuilt for new pear_testdir -- cgit