summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2012-11-05 18:21:20 +0100
committerRemi Collet <fedora@famillecollet.com>2012-11-05 18:21:20 +0100
commit732ff8e353694c8a694630b957c37b7d1352342b (patch)
treed95093784627acbf7dbd63a1188366740cbd02db
parent50b3622f84de2a7a1f54af3437494777d35aa76f (diff)
php-horde-Horde-Nls: cleanups
-rw-r--r--php-horde-Horde-Nls.spec16
1 files changed, 8 insertions, 8 deletions
diff --git a/php-horde-Horde-Nls.spec b/php-horde-Horde-Nls.spec
index e212d5f..75a366f 100644
--- a/php-horde-Horde-Nls.spec
+++ b/php-horde-Horde-Nls.spec
@@ -17,19 +17,22 @@ Source1: find-lang.sh
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildArch: noarch
-BuildRequires: php-pear
-BuildRequires: php-channel(%{pear_channel})
BuildRequires: gettext
+BuildRequires: php-pear(PEAR) >= 1.7.0
+BuildRequires: php-channel(%{pear_channel})
Requires(post): %{__pear}
Requires(postun): %{__pear}
Requires: php(language) >= 5.3.0
+Requires: php-date
+Requires: php-pcre
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)
+Requires: php-pear(Net_DNS2)
Provides: php-pear(%{pear_channel}/Horde_Nls) = %{version}
@@ -49,6 +52,7 @@ sed -e '/%{pear_name}.po/d' \
-e '/%{pear_name}.mo/s/md5sum=.*name=/name=/' \
../package.xml >%{name}.xml
+
%build
cd %{pear_name}-%{version}
@@ -58,8 +62,8 @@ do
msgfmt $po -o $(dirname $po)/$(basename $po .po).mo
done
+
%install
-rm -rf %{buildroot}
cd %{pear_name}-%{version}
%{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml
@@ -75,12 +79,8 @@ install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
%else
sh %{SOURCE1} %{buildroot} %{pear_name}
%endif
-head %{pear_name}.lang
-%clean
-rm -rf %{buildroot}
-
%post
%{__pear} install --nodeps --soft --force --register-only \
%{pear_xmldir}/%{name}.xml >/dev/null || :
@@ -104,7 +104,7 @@ fi
%dir %{pear_datadir}/Horde_Nls/locale/*
%dir %{pear_datadir}/Horde_Nls/locale/*/LC_MESSAGES
-%changelog
+
%changelog
* Thu Nov 1 2012 Remi Collet <RPMS@FamilleCollet.com> - 2.0.0-1
- Update to 2.0.0 for remi repo