From 60d637f87fe38c34527b09562888633fbfee699a Mon Sep 17 00:00:00 2001 From: Christopher Edward Lumens Date: Oct 23 2008 20:21:54 +0000 Subject: Fix a traceback when running under firstboot reconfig mode. --- diff --git a/system-config-keyboard-1.2.15-reconfig.patch b/system-config-keyboard-1.2.15-reconfig.patch new file mode 100644 index 0000000..ce07420 --- /dev/null +++ b/system-config-keyboard-1.2.15-reconfig.patch @@ -0,0 +1,14 @@ +Only in system-config-keyboard-1.2.15.orig/src: keyboard_backend.py.fixcomments +diff -ru system-config-keyboard-1.2.15.orig/src/keyboard_gui.py system-config-keyboard-1.2.15/src/keyboard_gui.py +--- system-config-keyboard-1.2.15.orig/src/keyboard_gui.py 2008-10-23 15:31:31.000000000 -0400 ++++ system-config-keyboard-1.2.15/src/keyboard_gui.py 2008-10-23 15:32:28.000000000 -0400 +@@ -145,7 +145,7 @@ + label.set_size_request(500, -1) + self.vbox.pack_start(label, False) + +- if not self.kbd.beenset: ++ if self.kbd.beenset: + default = defaultByLang + else: + default = self.kbd.get() +Only in system-config-keyboard-1.2.15.orig/src: keyboard_gui.py.beenset diff --git a/system-config-keyboard.spec b/system-config-keyboard.spec index 19e033f..9235b3b 100644 --- a/system-config-keyboard.spec +++ b/system-config-keyboard.spec @@ -1,6 +1,6 @@ Name: system-config-keyboard Version: 1.2.15 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A graphical interface for modifying the keyboard Group: System Environment/Base @@ -9,6 +9,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 +Patch2: system-config-keyboard-1.2.15-reconfig.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -34,6 +35,7 @@ the user to change the default keyboard of the system. %setup -q %patch0 -p0 -b .fixcomments %patch1 -p1 -b .beenset +%patch2 %build @@ -82,6 +84,9 @@ fi %changelog +* Thu Oct 23 2008 Chris Lumens 1.2.15-4 +- Fix a traceback when running under firstboot reconfig mode. + * Thu May 22 2008 Lubomir Rintel 1.2.15-3 - Fix traceback from firstboot (#305465)