From ae5d055fa0d24497ed094b4ddc8c2e4993e38cbb Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@fedoraproject.org>
Date: Sat, 12 Apr 2008 00:58:16 +0000
Subject: [PATCH] Fix the XKB fix

---
 gdm.spec         | 5 ++++-
 xkb-groups.patch | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/gdm.spec b/gdm.spec
index 81c4010..56b85d0 100644
--- a/gdm.spec
+++ b/gdm.spec
@@ -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 @@ fi
 %{_datadir}/gnome-2.0/ui/GNOME_FastUserSwitchApplet.xml
 
 %changelog
+* Fri Apr 11 2008 Matthias Clasen <mclasen@redhat.com> - 1:2.21.10-0.2008.04.11.3
+- Fix up the XKB workaround
+
 * Fri Apr 11 2008 Ray Strode <rstrode@redhat.com> - 1:2.21.10-0.2008.04.11.2
 - Fix security issue in last commit
 
diff --git a/xkb-groups.patch b/xkb-groups.patch
index 77dba95..41aa9b3 100644
--- a/xkb-groups.patch
+++ b/xkb-groups.patch
@@ -7,7 +7,7 @@ diff -up gdm-2.21.10/data/PreSession.in.xkb-groups gdm-2.21.10/data/PreSession.i
  
 +# 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"