From f4bda4e1d2a7732d84cb27176d41153b8e7fe25e0706e503cf26c382b6990e62 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Tue, 14 Dec 2010 18:42:31 +0000 Subject: [PATCH] Accepting request 56004 from home:vuntz:branches:GNOME:Factory ok OBS-URL: https://build.opensuse.org/request/show/56004 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-desktop?expand=0&rev=95 --- gnome-desktop.changes | 6 ++++++ gnome-desktop.spec | 6 ++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/gnome-desktop.changes b/gnome-desktop.changes index 5c5da78..10f930b 100644 --- a/gnome-desktop.changes +++ b/gnome-desktop.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Dec 14 19:42:40 CET 2010 - vuntz@opensuse.org + +- Stop removing kg locale on 11.4 and later: bnc#659001 has been + fixed. + ------------------------------------------------------------------- Tue Dec 14 08:31:03 UTC 2010 - dimstar@opensuse.org diff --git a/gnome-desktop.spec b/gnome-desktop.spec index 83dbe1e..38ddd80 100644 --- a/gnome-desktop.spec +++ b/gnome-desktop.spec @@ -21,7 +21,6 @@ Name: gnome-desktop Version: 2.91.3 Release: 2 -# FIXME: check if removal of locales in %install is still needed (last checked: 2010-12-11) License: LGPLv2.1+ Summary: The GNOME Desktop API Library Url: http://www.gnome.org @@ -128,10 +127,9 @@ make %{?jobs:-j%jobs} %if 0%{?suse_version} <= 1120 %{__rm} %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/* %endif -# FIXME: waiting for https://bugzilla.novell.com/show_bug.cgi?id=659001 ; once the bug is resolved, remove the comment for %if -#%if 0%{?suse_version} <= 1130 +%if 0%{?suse_version} <= 1130 %{__rm} %{buildroot}%{_datadir}/locale/kg/LC_MESSAGES/* -#%endif +%endif %find_lang %{name}-3.0 %if %IS_DEFAULT_GNOME_DESKTOP %find_lang fdl %{name}-3.0.lang