rpms/system-config-keyboard/devel system-config-keyboard-1.3.0-instroot.patch, NONE, 1.1 system-config-keyboard.spec, 1.52, 1.53

[Lubomir Rintel]

Author: lkundrak

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

Modified Files:
	system-config-keyboard.spec 
Added Files:
	system-config-keyboard-1.3.0-instroot.patch 
Log Message:
* Tue Aug 18 2009 Lubomir Rintel <lkundrak at v3.sk> 1.3.0-4
- Wrong keyboard layout after install fix (#517542), Chris Lumens


system-config-keyboard-1.3.0-instroot.patch:
 keyboard.py |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

--- NEW FILE system-config-keyboard-1.3.0-instroot.patch ---
>From b567829289bfb98b859aee6327c69603c7c73950 Mon Sep 17 00:00:00 2001
From: Chris Lumens <clumens at 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



Index: system-config-keyboard.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-keyboard/devel/system-config-keyboard.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- system-config-keyboard.spec	5 Aug 2009 11:44:49 -0000	1.52
+++ system-config-keyboard.spec	18 Aug 2009 05:21:53 -0000	1.53
@@ -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 
 %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 at v3.sk> 1.3.0-4
+- Wrong keyboard layout after install fix (#517542), Chris Lumens
+
 * Wed Aug 05 2009 Lubomir Rintel <lkundrak at v3.sk> 1.3.0-3
 - Include dracutSetupString() patch by Hans