rpms/system-config-keyboard/devel system-config-keyboard-1.2.15-nolayout.patch, NONE, 1.1 system-config-keyboard.spec, 1.45, 1.46

[Peter Hutterer]

Author: whot

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

Modified Files:
	system-config-keyboard.spec 
Added Files:
	system-config-keyboard-1.2.15-nolayout.patch 
Log Message:
* Wed Mar 04 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.2.15-8
- system-config-keyboard-1.2.15-nolayout.patch: insert a default ServerLayout
  section if none is found.



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/devel/system-config-keyboard.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- system-config-keyboard.spec	26 Feb 2009 05:06:55 -0000	1.45
+++ system-config-keyboard.spec	4 Mar 2009 01:05:38 -0000	1.46
@@ -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 @@
 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 @@
 %patch2 -p1 -b .reconfig
 %patch3 -p1 -b .icon
 %patch4 -p1 -b .ext
+%patch5 -p1 -b .nolayout
 
 
 %build
@@ -88,6 +90,10 @@
 
 
 %changelog
+* Wed Mar 04 2009 Peter Hutterer <peter.hutterer at 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 at lists.fedoraproject.org> - 1.2.15-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild