rpms/system-config-keyboard/devel system-config-keyboard-1.2.14-nocorekeyb.patch, NONE, 1.1 system-config-keyboard.spec, 1.36, 1.37

[Lubomir Kundrak (lkundrak)]

Author: lkundrak

Update of /cvs/pkgs/rpms/system-config-keyboard/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13959/devel

Modified Files:
	system-config-keyboard.spec 
Added Files:
	system-config-keyboard-1.2.14-nocorekeyb.patch 
Log Message:
* Sat Apr 12 2008 Lubomir Kundrak <lkundrak at redhat.com> 1.2.14-3
- Handle situations where CoreKeyboard is not present
- Fix License tag


system-config-keyboard-1.2.14-nocorekeyb.patch:

--- NEW FILE system-config-keyboard-1.2.14-nocorekeyb.patch ---
Index: src/keyboard_backend.py
===================================================================
--- src/keyboard_backend.py	(revision 559)
+++ src/keyboard_backend.py	(working copy)
@@ -1,9 +1,11 @@
 #
-# keyboard_backend.py - backend code for mouse configuration
+# keyboard_backend.py - backend code for keyboard configuration
 #
 # Copyright (C) 2002, 2003 Red Hat, Inc.
 # Brent Fox <bfox at redhat.com>
 #
+# Copyright (C) 2008 Lubomir Kundrak <lkundrak at redhat.com>
+#
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
@@ -31,7 +33,18 @@
         if os.access("/etc/X11/XF86Config", os.W_OK) or os.access("/etc/X11/xorg.conf", os.W_OK):        
             import xf86config
             (xconfig, xconfigpath) = xf86config.readConfigFile()
-            keyboard = xf86config.getCoreKeyboard(xconfig)
+            try:
+                keyboard = xf86config.getCoreKeyboard(xconfig)
+            except:
+                xconfig.comment = '# This configuration file was broken by system-config-keyboard'
+                keyboard = xf86config.XF86ConfInput ();
+                keyboard.comment = "# Keyboard added by system-config-keyboard"
+                keyboard.identifier = "Keyboard0"
+                keyboard.driver = "kbd"
+                keyboard.options.insert (xf86config.XF86Option("XkbModel", "pc101"))
+                keyboard.options.insert (xf86config.XF86Option("XkbLayout", "us"))
+                xconfig.input.insert (keyboard)
+                xconfig.layout[0].inputs.insert (xf86config.XF86ConfInputref ("Keyboard0", "CoreKeyboard"));
             
             found = 0
             for o in keyboard.options:


Index: system-config-keyboard.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-keyboard/devel/system-config-keyboard.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- system-config-keyboard.spec	5 Apr 2008 20:59:08 -0000	1.36
+++ system-config-keyboard.spec	11 Apr 2008 20:13:26 -0000	1.37
@@ -1,14 +1,15 @@
 Name:           system-config-keyboard
 Version:        1.2.14
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A graphical interface for modifying the keyboard
 
 Group:          System Environment/Base
-License:        GPL+
+License:        GPL2+
 URL:            https://fedorahosted.org/system-config-keyboard/
 Source0:        %{name}-%{version}.tar.bz2
 Patch0:         system-config-keyboard-1.2.14-desktop.patch
 Patch1:         system-config-keyboard-1.2.14-cherrypick.patch
+Patch2:         system-config-keyboard-1.2.14-nocorekeyb.patch 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -34,6 +35,7 @@
 %setup -q
 %patch0 -p0 -b .desktop
 %patch1 -p0 -b .cherrypick
+%patch2 -p0 -b .nocorekeyb
 
 
 %build
@@ -81,7 +83,11 @@
 
 
 %changelog
-* Sat Apr 05 2008 Bill Nottingham <notting at redhat.com> 1.2.14-2
+* Sat Apr 12 2008 Lubomir Kundrak <lkundrak at redhat.com> 1.2.14-3
+- Handle situations where CoreKeyboard is not present
+- Fix License tag
+
+* Sat Apr 05 2008 Lubomir Kundrak <lkundrak at redhat.com> 1.2.14-2
 - Do not show in KDE and Gnome menus
 - Rework specfile