rpms/system-config-keyboard/F-10 system-config-keyboard-1.2.15-nolayout.patch, NONE, 1.1 system-config-keyboard.spec, 1.42, 1.43

[Peter Hutterer]

Author: whot

Update of /cvs/pkgs/rpms/system-config-keyboard/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11536

Modified Files:
	system-config-keyboard.spec 
Added Files:
	system-config-keyboard-1.2.15-nolayout.patch 
Log Message:
* Tue Mar 10 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.2.15-5
- system-config-keyboard-1.2.15-nolayout.patch: insert a default ServerLayout
  section if none is found. (#484488)


system-config-keyboard-1.2.15-nolayout.patch:

--- NEW FILE system-config-keyboard-1.2.15-nolayout.patch ---
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


Index: system-config-keyboard.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-keyboard/F-10/system-config-keyboard.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- system-config-keyboard.spec	23 Oct 2008 20:32:57 -0000	1.42
+++ system-config-keyboard.spec	9 Mar 2009 22:44:39 -0000	1.43
@@ -1,6 +1,6 @@
 Name:           system-config-keyboard
 Version:        1.2.15
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A graphical interface for modifying the keyboard
 
 Group:          System Environment/Base
@@ -10,6 +10,7 @@
 Patch0:         system-config-keyboard-1.2.15-fixcomments.patch
 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-nolayout.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -36,6 +37,7 @@
 %patch0 -p0 -b .fixcomments
 %patch1 -p1 -b .beenset
 %patch2 -p1
+%patch3 -p1
 
 
 %build
@@ -84,6 +86,10 @@
 
 
 %changelog
+* Tue Mar 10 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.2.15-5
+- system-config-keyboard-1.2.15-nolayout.patch: insert a default ServerLayout
+  section if none is found. (#484488)
+
 * Thu Oct 23 2008 Chris Lumens <clumens at redhat.com> 1.2.15-4
 - Fix a traceback when running under firstboot reconfig mode.