rpms/control-center/devel gnomekbd.patch, NONE, 1.1 control-center.spec, 1.451, 1.452

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/control-center/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2541

Modified Files:
	control-center.spec 
Added Files:
	gnomekbd.patch 
Log Message:
fix the build


gnomekbd.patch:

--- NEW FILE gnomekbd.patch ---
diff -up gnome-control-center-2.27.3/capplets/keyboard/gnome-keyboard-properties-xkb.c.libgnomekbd gnome-control-center-2.27.3/capplets/keyboard/gnome-keyboard-properties-xkb.c
--- gnome-control-center-2.27.3/capplets/keyboard/gnome-keyboard-properties-xkb.c.libgnomekbd	2009-07-01 13:56:06.628794369 -0400
+++ gnome-control-center-2.27.3/capplets/keyboard/gnome-keyboard-properties-xkb.c	2009-07-01 13:56:19.537797461 -0400
@@ -161,8 +161,7 @@ setup_xkb_tabs (GladeXML * dialog, GConf
 	gkbd_desktop_config_init (&desktop_config, xkb_gconf_client, engine);
 	gkbd_desktop_config_load_from_gconf (&desktop_config);
 
-	xkl_config_registry_load (config_registry,
-				  desktop_config.load_extra_items);
+	xkl_config_registry_load (config_registry, FALSE);
 
 	gkbd_keyboard_config_init (&initial_config, xkb_gconf_client,
 				   engine);


Index: control-center.spec
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.451
retrieving revision 1.452
diff -u -p -r1.451 -r1.452
--- control-center.spec	30 Jun 2009 17:38:53 -0000	1.451
+++ control-center.spec	1 Jul 2009 18:01:40 -0000	1.452
@@ -58,6 +58,9 @@ Patch35: gnome-control-center-2.26.0-sup
 # http://bugzilla.gnome.org/show_bug.cgi?id=536531
 Patch37: polkit1.patch
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=587355
+Patch42: gnomekbd.patch
+
 # call the Fedora/RHEL graphical passwd changing apps
 Patch95: gnome-control-center-2.25.2-passwd.patch
 Patch96: gnome-control-center-2.25.2-gecos.patch
@@ -180,6 +183,8 @@ utilities.
 %patch33 -p1 -b .notification-theme
 %patch34 -p0 -b .new-icons
 %patch35 -p1 -b .support-touchpads
+%patch42 -p1 -b .gnomekbd
+
 pushd capplets/about-me
 mv *png icons/
 popd