packages: system-config-keyboard/system-config-keyboard.spec, system-config...

[glen]

Author: glen                         Date: Sat Mar  3 16:46:18 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- process proper file for keyboard layouts

---- Files affected:
packages/system-config-keyboard:
   system-config-keyboard.spec (1.19 -> 1.20) , kbdconf.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/system-config-keyboard/system-config-keyboard.spec
diff -u packages/system-config-keyboard/system-config-keyboard.spec:1.19 packages/system-config-keyboard/system-config-keyboard.spec:1.20
--- packages/system-config-keyboard/system-config-keyboard.spec:1.19	Sat Mar  3 16:20:43 2012
+++ packages/system-config-keyboard/system-config-keyboard.spec	Sat Mar  3 17:46:13 2012
@@ -3,13 +3,14 @@
 Summary(pl.UTF-8):	Graficzny interfejs do zmiany klawiatury
 Name:		system-config-keyboard
 Version:	1.3.1
-Release:	0.10
+Release:	0.14
 License:	GPL v2+
 Group:		Base
 Source0:	https://fedorahosted.org/releases/s/y/system-config-keyboard/%{name}-%{version}.tar.gz
 # Source0-md5:	012b1aec6d237f853bea6824e71d19ed
 Patch0:		s-c-keyboard-do_not_remove_the_OK_button.patch
 Patch1:		sck-1.3.1-no-pyxf86config.patch
+Patch2:		kbdconf.patch
 URL:		https://fedorahosted.org/system-config-keyboard/
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext-devel
@@ -21,6 +22,7 @@
 Requires:	gtk+2 >= 2:2.6
 Requires:	python >= 1:2.0
 Requires:	python-rhpl >= 0.53
+Requires:	usermode >= 1.108
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -36,6 +38,7 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__make}
@@ -99,6 +102,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.20  2012/03/03 16:46:13  glen
+- process proper file for keyboard layouts
+
 Revision 1.19  2012/03/03 15:20:43  glen
 - python-xf86config is out
 

================================================================
Index: packages/system-config-keyboard/kbdconf.patch
diff -u /dev/null packages/system-config-keyboard/kbdconf.patch:1.1
--- /dev/null	Sat Mar  3 17:46:18 2012
+++ packages/system-config-keyboard/kbdconf.patch	Sat Mar  3 17:46:13 2012
@@ -0,0 +1,20 @@
+--- system-config-keyboard-1.3.1/./lib/keyboard.py~	2009-09-14 14:03:43.000000000 +0300
++++ system-config-keyboard-1.3.1/./lib/keyboard.py	2012-03-03 17:23:49.125243674 +0200
+@@ -120,7 +120,7 @@
+ 
+     def read(self, instPath = "/"):
+         try:
+-            file = open(instPath + "/etc/sysconfig/keyboard", "r")
++            file = open(instPath + "/etc/sysconfig/console", "r")
+         except:
+             return
+         self.config = []
+@@ -133,7 +133,7 @@
+         self.beenset = 1
+ 
+     def write(self, instPath = "/"):
+-	file = open(instPath + "/etc/sysconfig/keyboard", "w")
++	file = open(instPath + "/etc/sysconfig/console", "w")
+ 	for line in self.config:
+                 file.write (line[0]);
+         try:
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/system-config-keyboard/system-config-keyboard.spec?r1=1.19&r2=1.20&f=u