rpms/system-config-keyboard/devel system-config-keyboard-1.2.15-beenset.patch, NONE, 1.1 system-config-keyboard.spec, 1.39, 1.40

[Lubomir Rintel (lkundrak)]

Author: lkundrak

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

Modified Files:
	system-config-keyboard.spec 
Added Files:
	system-config-keyboard-1.2.15-beenset.patch 
Log Message:
* Thu May 22 2008 Lubomir Rintel <lkundrak at v3.sk> 1.2.15-3
- Fix traceback from firstboot (#305465)

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

--- NEW FILE system-config-keyboard-1.2.15-beenset.patch ---
https://bugzilla.redhat.com/attachment.cgi?id=305465
Patch by Tim Waugh. Already commited upstream.

diff -up system-config-keyboard-1.2.15/src/keyboard_gui.py.traceback system-config-keyboard-1.2.15/src/keyboard_gui.py
--- system-config-keyboard-1.2.15/src/keyboard_gui.py.traceback	2008-05-15 11:41:30.000000000 +0100
+++ system-config-keyboard-1.2.15/src/keyboard_gui.py	2008-05-15 11:43:11.000000000 +0100
@@ -133,8 +133,8 @@ class moduleClass(Module):
     def createScreen(self, defaultByLang=None, kbd=None):
         if kbd is None:
             kbd = keyboard.Keyboard()
-        else:
-            self.kbd = kbd
+
+        self.kbd = kbd
 
         self.vbox = gtk.VBox()
         self.vbox.set_spacing(10)


Index: system-config-keyboard.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-keyboard/devel/system-config-keyboard.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- system-config-keyboard.spec	12 Apr 2008 15:16:03 -0000	1.39
+++ system-config-keyboard.spec	22 May 2008 10:42:57 -0000	1.40
@@ -1,6 +1,6 @@
 Name:           system-config-keyboard
 Version:        1.2.15
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A graphical interface for modifying the keyboard
 
 Group:          System Environment/Base
@@ -8,6 +8,7 @@
 URL:            https://fedorahosted.org/system-config-keyboard/
 Source0:        %{name}-%{version}.tar.gz
 Patch0:         system-config-keyboard-1.2.15-fixcomments.patch
+Patch1:         system-config-keyboard-1.2.15-beenset.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -32,6 +33,7 @@
 %prep
 %setup -q
 %patch0 -p0 -b .fixcomments
+%patch1 -p1 -b .beenset
 
 
 %build
@@ -80,6 +82,9 @@
 
 
 %changelog
+* Thu May 22 2008 Lubomir Rintel <lkundrak at v3.sk> 1.2.15-3
+- Fix traceback from firstboot (#305465)
+
 * Sat Apr 12 2008 Lubomir Kundrak <lkundrak at redhat.com> 1.2.15-2
 - Fix the comment line ending