rpms/gdm/devel gdm.spec,1.372,1.373 xkb-groups.patch,1.1,1.2

[Matthias Clasen (mclasen)]

Author: mclasen

Update of /cvs/extras/rpms/gdm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21022

Modified Files:
	gdm.spec xkb-groups.patch 
Log Message:
Fix the XKB fix



Index: gdm.spec
===================================================================
RCS file: /cvs/extras/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.372
retrieving revision 1.373
diff -u -r1.372 -r1.373
--- gdm.spec	11 Apr 2008 22:08:47 -0000	1.372
+++ gdm.spec	12 Apr 2008 00:58:16 -0000	1.373
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.21.10
-Release: 0.2008.04.11.2%{?dist}
+Release: 0.2008.04.11.3%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -299,6 +299,9 @@
 %{_datadir}/gnome-2.0/ui/GNOME_FastUserSwitchApplet.xml
 
 %changelog
+* Fri Apr 11 2008 Matthias Clasen <mclasen at redhat.com> - 1:2.21.10-0.2008.04.11.3
+- Fix up the XKB workaround
+
 * Fri Apr 11 2008 Ray Strode <rstrode at redhat.com> - 1:2.21.10-0.2008.04.11.2
 - Fix security issue in last commit
 

xkb-groups.patch:

Index: xkb-groups.patch
===================================================================
RCS file: /cvs/extras/rpms/gdm/devel/xkb-groups.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xkb-groups.patch	10 Apr 2008 20:59:51 -0000	1.1
+++ xkb-groups.patch	12 Apr 2008 00:58:16 -0000	1.2
@@ -7,7 +7,7 @@
  
 +# Workaround for an X problem where the initial XKB configuration has
 +# and extra group without an associated layout. 
-+setxkbcomp
++setxkbmap
 +
  # some output for easy debugging
  echo "$0: could not find the sessreg utility, cannot update wtmp and utmp"