From dfcc45f5e8763cef762b5f2ab69ad026703a96ce Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak@fedoraproject.org>
Date: Aug 18 2009 05:21:53 +0000
Subject: - Wrong keyboard layout after install fix (#517542), Chris Lumens


---

diff --git a/system-config-keyboard-1.3.0-instroot.patch b/system-config-keyboard-1.3.0-instroot.patch
new file mode 100644
index 0000000..bc67f16
--- /dev/null
+++ b/system-config-keyboard-1.3.0-instroot.patch
@@ -0,0 +1,35 @@
+From b567829289bfb98b859aee6327c69603c7c73950 Mon Sep 17 00:00:00 2001
+From: Chris Lumens <clumens@redhat.com>
+Date: Tue, 18 Aug 2009 07:17:37 +0200
+Subject: [PATCH] Create /etc/sysconfig/keyboard in instroot
+
+https://bugzilla.redhat.com/show_bug.cgi?id=517542
+---
+ lib/keyboard.py |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/lib/keyboard.py b/lib/keyboard.py
+index 9a0cdc1..5b0ac00 100644
+--- a/lib/keyboard.py
++++ b/lib/keyboard.py
+@@ -120,7 +120,7 @@ class Keyboard():
+ 
+     def read(self, instPath = "/"):
+         try:
+-            file = open("/etc/sysconfig/keyboard", "r")
++            file = open(instPath + "/etc/sysconfig/keyboard", "r")
+         except:
+             return
+         self.config = []
+@@ -133,7 +133,7 @@ class Keyboard():
+         self.beenset = 1
+ 
+     def write(self, instPath = "/"):
+-	file = open("/etc/sysconfig/keyboard", "w")
++	file = open(instPath + "/etc/sysconfig/keyboard", "w")
+ 	for line in self.config:
+                 file.write (line[0]);
+         try:
+-- 
+1.6.2.5
+
diff --git a/system-config-keyboard.spec b/system-config-keyboard.spec
index 6aa0437..c4a4f9d 100644
--- a/system-config-keyboard.spec
+++ b/system-config-keyboard.spec
@@ -3,7 +3,7 @@
 
 Name:           system-config-keyboard
 Version:        1.3.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A graphical interface for modifying the keyboard
 
 Group:          System Environment/Base
@@ -11,6 +11,7 @@ License:        GPLv2+
 URL:            https://fedorahosted.org/system-config-keyboard/
 Source0:        https://fedorahosted.org/releases/s/y/system-config-keyboard/%{name}-%{version}.tar.gz
 Patch0:         system-config-keyboard-dracut.patch
+Patch1:         system-config-keyboard-1.3.0-instroot.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -35,6 +36,7 @@ the user to change the default keyboard of the system.
 %prep
 %setup -q
 %patch0 -p0 -b .dracut
+%patch1 -p1 -b .instroot
 
 
 %build
@@ -84,6 +86,9 @@ fi
 
 
 %changelog
+* Tue Aug 18 2009 Lubomir Rintel <lkundrak@v3.sk> 1.3.0-4
+- Wrong keyboard layout after install fix (#517542), Chris Lumens
+
 * Wed Aug 05 2009 Lubomir Rintel <lkundrak@v3.sk> 1.3.0-3
 - Include dracutSetupString() patch by Hans