diff options
| -rw-r--r-- | php-horde-Horde-Nls.spec | 44 |
1 files changed, 27 insertions, 17 deletions
diff --git a/php-horde-Horde-Nls.spec b/php-horde-Horde-Nls.spec index 62fc73a..e212d5f 100644 --- a/php-horde-Horde-Nls.spec +++ b/php-horde-Horde-Nls.spec @@ -1,9 +1,11 @@ +%{!?pear_metadir: %global pear_metadir %{pear_phpdir}} %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}} -%global pear_name Horde_Nls +%global pear_name Horde_Nls +%global pear_channel pear.horde.org Name: php-horde-Horde-Nls -Version: 1.1.6 -Release: 3%{?dist} +Version: 2.0.0 +Release: 1%{?dist} Summary: Native Language Support (NLS) Group: Development/Libraries @@ -15,25 +17,30 @@ 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-pear(PEAR) >= 1.7.0 -Requires: php-pear(pear.horde.org/Horde_Util) < 2.0.0 +Requires: php(language) >= 5.3.0 +Requires: php-pear(%{pear_channel}/Horde_Util) >= 2.0.0 +Conflicts: php-pear(%{pear_channel}/Horde_Util) >= 3.0.0 +Requires: php-pear(%{pear_channel}/Horde_Translation) >= 2.0.0 +Conflicts: php-pear(%{pear_channel}/Horde_Translation) >= 3.0.0 # Optionnal Requires: php-pecl(geoip) -Provides: php-pear(pear.horde.org/Horde_Nls) = %{version} +Provides: php-pear(%{pear_channel}/Horde_Nls) = %{version} %description Common methods for handling language data, timezones, and hostname->country lookups. %prep -%setup -q -c +%setup -q -c -T +tar xif %{SOURCE0} + cd %{pear_name}-%{version} # Don't install .po and .pot files @@ -52,27 +59,27 @@ 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} %else -sh %{SOURCE1} $RPM_BUILD_ROOT %{pear_name} +sh %{SOURCE1} %{buildroot} %{pear_name} %endif head %{pear_name}.lang %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %post %{__pear} install --nodeps --soft --force --register-only \ @@ -81,7 +88,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 @@ -99,6 +106,9 @@ fi %changelog %changelog +* Thu Nov 1 2012 Remi Collet <RPMS@FamilleCollet.com> - 2.0.0-1 +- Update to 2.0.0 for remi repo + * Sun Aug 19 2012 Remi Collet <remi@fedoraproject.org> - 1.1.6-3 - rebuilt for new pear_datadir |