From 85e717a3c0ed9f67198c8e5ffcfb8e9b7c768cbf Mon Sep 17 00:00:00 2001
From: Peter Hutterer <whot@fedoraproject.org>
Date: Mar 04 2009 01:05:38 +0000
Subject: - system-config-keyboard-1.2.15-nolayout.patch: insert a default

    ServerLayout section if none is found.

---

diff --git a/system-config-keyboard-1.2.15-nolayout.patch b/system-config-keyboard-1.2.15-nolayout.patch
new file mode 100644
index 0000000..d2af1b7
--- /dev/null
+++ b/system-config-keyboard-1.2.15-nolayout.patch
@@ -0,0 +1,16 @@
+Create a default layout if none is given before inserting the core keyboard.
+
+Index: keyboard_backend.py
+===================================================================
+--- system-config-keyboard-1.2.15/src/keyboard_backend.py	(revision 569)
++++ system-config-keyboard-1.2.15/src/keyboard_backend.py	(working copy)
+@@ -44,6 +44,9 @@
+                 keyboard.options.insert (xf86config.XF86Option("XkbModel", "pc101"))
+                 keyboard.options.insert (xf86config.XF86Option("XkbLayout", "us"))
+                 xconfig.input.insert (keyboard)
++                if len(xconfig.layout) == 0:
++                    xconfig.layout.insert(xf86config.XF86ConfLayout())
++
+                 xconfig.layout[0].inputs.insert (xf86config.XF86ConfInputref ("Keyboard0", "CoreKeyboard"));
+             
+             found = 0
diff --git a/system-config-keyboard.spec b/system-config-keyboard.spec
index d19049a..6842b16 100644
--- a/system-config-keyboard.spec
+++ b/system-config-keyboard.spec
@@ -1,6 +1,6 @@
 Name:           system-config-keyboard
 Version:        1.2.15
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        A graphical interface for modifying the keyboard
 
 Group:          System Environment/Base
@@ -12,6 +12,7 @@ Patch1:         system-config-keyboard-1.2.15-beenset.patch
 Patch2:         system-config-keyboard-1.2.15-reconfig.patch
 Patch3:         system-config-keyboard-1.2.15-icon.patch
 Patch4:         system-config-keyboard-1.2.15-ext.patch
+Patch5:         system-config-keyboard-1.2.15-nolayout.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -40,6 +41,7 @@ the user to change the default keyboard of the system.
 %patch2 -p1 -b .reconfig
 %patch3 -p1 -b .icon
 %patch4 -p1 -b .ext
+%patch5 -p1 -b .nolayout
 
 
 %build
@@ -88,6 +90,10 @@ fi
 
 
 %changelog
+* Wed Mar 04 2009 Peter Hutterer <peter.hutterer@redhat.com> 1.2.15-8
+- system-config-keyboard-1.2.15-nolayout.patch: insert a default ServerLayout
+  section if none is found.
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.15-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild