rpms/system-config-keyboard/devel system-config-keyboard-dracut.patch, NONE, 1.1 system-config-keyboard.spec, 1.51, 1.52

[Lubomir Rintel]

Author: lkundrak

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

Modified Files:
	system-config-keyboard.spec 
Added Files:
	system-config-keyboard-dracut.patch 
Log Message:
* Wed Aug 05 2009 Lubomir Rintel <lkundrak at v3.sk> 1.3.0-3
- Include dracutSetupString() patch by Hans


system-config-keyboard-dracut.patch:
 keyboard.py |   12 ++++++++++++
 1 file changed, 12 insertions(+)

--- NEW FILE system-config-keyboard-dracut.patch ---
Index: lib/keyboard.py
===================================================================
--- lib/keyboard.py	(revision 596)
+++ lib/keyboard.py	(working copy)
@@ -186,3 +186,15 @@
 
         if os.access(argv[0], os.X_OK) == 1:
             call (argv)
+
+    def dracutSetupString(self):
+        args = ""
+        keyboardtype = self._var("KEYBOARDTYPE")
+        keytable = self._var("KEYTABLE")
+
+        if keyboardtype:
+             args += " KEYBOARDTYPE=%s" % keyboardtype
+        if keytable:
+             args += " KEYTABLE=%s" % keytable
+
+        return args


Index: system-config-keyboard.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-keyboard/devel/system-config-keyboard.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- system-config-keyboard.spec	28 Jul 2009 11:17:31 -0000	1.51
+++ system-config-keyboard.spec	5 Aug 2009 11:44:49 -0000	1.52
@@ -3,13 +3,14 @@
 
 Name:           system-config-keyboard
 Version:        1.3.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A graphical interface for modifying the keyboard
 
 Group:          System Environment/Base
 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
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -33,6 +34,7 @@ the user to change the default keyboard 
 
 %prep
 %setup -q
+%patch0 -p0 -b .dracut
 
 
 %build
@@ -82,6 +84,9 @@ fi
 
 
 %changelog
+* Wed Aug 05 2009 Lubomir Rintel <lkundrak at v3.sk> 1.3.0-3
+- Include dracutSetupString() patch by Hans
+
 * Mon Jul 27 2009 Lubomir Rintel <lkundrak at v3.sk> 1.3.0-2
 - Disable debuginfo subpackage