From 3fe4744d2e2186cd76b11f9dd7c2e56d1a9913fa8821d6bcf8a6fc4150bfcc87 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Mon, 13 Dec 2010 11:32:55 +0000 Subject: [PATCH 1/2] Updating link to change in openSUSE:Factory/gtk2 revision 100.0 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk2?expand=0&rev=b91699a79a11c29c36f775cce56db7ee --- gtk2.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gtk2.spec b/gtk2.spec index ec016c4..2a46d31 100644 --- a/gtk2.spec +++ b/gtk2.spec @@ -22,7 +22,7 @@ Name: gtk2 %define _name gtk+ Version: 2.22.1 -Release: 2 +Release: 3 # NOTE: on upgrade to a new upstream version, change the Obsoletes from <= to < (here and in baselibs.conf) # FIXME: check if removal of locales in %install is still needed (last checked: 2010-12-12) # FIXME: 2.19.3 doesn't compile with parallel build. Check if this is still true for later versions. From fd0e0bd8d4b11b1c3d561fb9e7af92c5d1e378bb18abc2790bf7690efba38cfa Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Tue, 14 Dec 2010 18:25:03 +0000 Subject: [PATCH 2/2] Accepting request 55995 from home:vuntz:branches:GNOME:Factory OBS-URL: https://build.opensuse.org/request/show/55995 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk2?expand=0&rev=134 --- gtk2.changes | 6 ++++++ gtk2.spec | 6 ++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/gtk2.changes b/gtk2.changes index 2b83f77..c991567 100644 --- a/gtk2.changes +++ b/gtk2.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Dec 14 19:02:56 CET 2010 - vuntz@opensuse.org + +- Stop removing kg locale on 11.4 and later: bnc#659001 has been + fixed. + ------------------------------------------------------------------- Sun Dec 12 13:45:58 CET 2010 - vuntz@opensuse.org diff --git a/gtk2.spec b/gtk2.spec index 2a46d31..3af2de7 100644 --- a/gtk2.spec +++ b/gtk2.spec @@ -24,7 +24,6 @@ Name: gtk2 Version: 2.22.1 Release: 3 # NOTE: on upgrade to a new upstream version, change the Obsoletes from <= to < (here and in baselibs.conf) -# FIXME: check if removal of locales in %install is still needed (last checked: 2010-12-12) # FIXME: 2.19.3 doesn't compile with parallel build. Check if this is still true for later versions. # FIXME: when updating to next version, check whether we can remove the workaround for bgo#596977 below (removing -fomit-frame-pointer) License: LGPLv2.1+ @@ -324,10 +323,9 @@ export CFLAGS=`echo $CFLAGS | sed -e 's/-fomit-frame-pointer//g'` %install %makeinstall find %{buildroot}%{_libdir} -name '*.la' -delete -print -# 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 gtk20 %find_lang gtk20-properties install -m 644 %{S:3} %{buildroot}%{_sysconfdir}/gtk-2.0