From 09f66fe39e10b5c0cd863486745cf4f83cdf34605671bc33e8bbbd93e986aab2 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Thu, 3 Dec 2009 01:50:04 +0000 Subject: [PATCH] Accepting request 25384 from home:vuntz:branches:GNOME:Factory Copy from home:vuntz:branches:GNOME:Factory/nautilus via accept of submit request 25384 revision 45. Request was accepted with message: Accepting... OBS-URL: https://build.opensuse.org/request/show/25384 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/nautilus?expand=0&rev=70 --- nautilus.changes | 6 ++++++ nautilus.spec | 10 ++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/nautilus.changes b/nautilus.changes index 6fec03d..89b6984 100644 --- a/nautilus.changes +++ b/nautilus.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Dec 2 12:05:34 CET 2009 - vuntz@opensuse.org + +- Update the way we remove the ha, ig locales for old versions of + openSUSE. + ------------------------------------------------------------------- Tue Dec 1 13:26:39 CET 2009 - dimstar@opensuse.org diff --git a/nautilus.spec b/nautilus.spec index c29f327..10e8e2e 100644 --- a/nautilus.spec +++ b/nautilus.spec @@ -103,6 +103,10 @@ NOCONFIGURE=1 gnome-autogen.sh %install %makeinstall +%if 0%{?suse_version} <= 1110 +%{__rm} %{buildroot}%{_datadir}/locale/ha/LC_MESSAGES/* +%{__rm} %{buildroot}%{_datadir}/locale/ig/LC_MESSAGES/* +%endif rm $RPM_BUILD_ROOT/%{_libdir}/*.*a ### ln -s ../icons/gnome/24x24/devices/gnome-fs-client.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/ # FIXME: this is probably wrong, but it enables the build to succeed for now @@ -166,12 +170,6 @@ fi %dir %{_libdir}/nautilus/extensions-2.0 %files lang -f %{name}.lang -# remove the comment on the %if once bnc#470409 is fixed -#%if %suse_version <= 1110 -# exclude locales which don't exist on old versions of openSUSE -%exclude %{_datadir}/locale/ha/LC_MESSAGES/* -%exclude %{_datadir}/locale/ig/LC_MESSAGES/* -#%endif %files devel %defattr(-,root,root)