From b61922fd9ed7198b975edfc731b6e825cfe47f60 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@fedoraproject.org>
Date: Apr 10 2008 20:59:51 +0000
Subject: Work around a XKB problem


---

diff --git a/gdm.spec b/gdm.spec
index 924e87d..3bbac51 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.08.3%{?dist}
+Release: 0.2008.04.08.4%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -76,6 +76,7 @@ BuildRequires: gnome-panel-devel
 
 Requires: audit-libs >= %{libauditver}
 Patch0: ck-multi.patch
+Patch1: xkb-groups.patch
 Patch98: gdm-2.21.10-disable-debug-messages.patch
 Patch99: gdm-2.21.8-fedora-logo.patch
 
@@ -97,6 +98,7 @@ multiple simulanteous logged in users.
 %prep
 %setup -q
 %patch0 -p1 -b .ck-multi
+%patch1 -p1 -b .xkb-groups
 %patch98 -p1 -b .disable-debug-messages
 %patch99 -p1 -b .fedora-logo
 
@@ -295,6 +297,9 @@ fi
 %{_datadir}/gnome-2.0/ui/GNOME_FastUserSwitchApplet.xml
 
 %changelog
+* Thu Apr 10 2008 Matthias Clasen <mclasen@redhat.com> - 1:2.21.10-0.2008.04.08.4
+- Work around a XKB problem 
+
 * Tue Apr  8 2008 Ray Strode <rstrode@redhat.com> - 1:2.21.10-0.2008.04.08.3
 - Language list was incomplete (bug 441613)
 
diff --git a/xkb-groups.patch b/xkb-groups.patch
new file mode 100644
index 0000000..77dba95
--- /dev/null
+++ b/xkb-groups.patch
@@ -0,0 +1,14 @@
+diff -up gdm-2.21.10/data/PreSession.in.xkb-groups gdm-2.21.10/data/PreSession.in
+--- gdm-2.21.10/data/PreSession.in.xkb-groups	2008-04-10 16:55:23.000000000 -0400
++++ gdm-2.21.10/data/PreSession.in	2008-04-10 16:57:09.000000000 -0400
+@@ -79,6 +79,10 @@ if [ "x$SESSREG" != "x" ] ; then
+ 	# this is not reached
+ fi
+ 
++# Workaround for an X problem where the initial XKB configuration has
++# and extra group without an associated layout. 
++setxkbcomp
++
+ # some output for easy debugging
+ echo "$0: could not find the sessreg utility, cannot update wtmp and utmp"
+ exit 0