rpms/gdm/devel xkb-groups.patch,NONE,1.1 gdm.spec,1.368,1.369

[Matthias Clasen (mclasen)]

Author: mclasen

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

Modified Files:
	gdm.spec 
Added Files:
	xkb-groups.patch 
Log Message:
Work around a XKB problem


xkb-groups.patch:

--- NEW FILE xkb-groups.patch ---
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


Index: gdm.spec
===================================================================
RCS file: /cvs/extras/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.368
retrieving revision 1.369
diff -u -r1.368 -r1.369
--- gdm.spec	9 Apr 2008 03:57:12 -0000	1.368
+++ gdm.spec	10 Apr 2008 20:59:51 -0000	1.369
@@ -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 @@
 
 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 @@
 %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 @@
 %{_datadir}/gnome-2.0/ui/GNOME_FastUserSwitchApplet.xml
 
 %changelog
+* Thu Apr 10 2008 Matthias Clasen <mclasen at redhat.com> - 1:2.21.10-0.2008.04.08.4
+- Work around a XKB problem 
+
 * Tue Apr  8 2008 Ray Strode <rstrode at redhat.com> - 1:2.21.10-0.2008.04.08.3
 - Language list was incomplete (bug 441613)