rpms/rhpl/devel rhpl-0.216-no-model.patch, NONE, 1.1 rhpl.spec, 1.115, 1.116

[Adam Jackson]

Author: ajax

Update of /cvs/pkgs/rpms/rhpl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20150

Modified Files:
	rhpl.spec 
Added Files:
	rhpl-0.216-no-model.patch 
Log Message:
* Wed Sep 24 2008 Adam Jackson <ajax at redhat.com> 0.216-2
- rhpl-0.216-no-model.patch: Don't set XKB model, it's not meaningful for
  evdev keyboards and it makes your arrow keys not work. (#461832)


rhpl-0.216-no-model.patch:

--- NEW FILE rhpl-0.216-no-model.patch ---
diff -up rhpl-0.216/src/keyboard.py.jx rhpl-0.216/src/keyboard.py
--- rhpl-0.216/src/keyboard.py.jx	2008-06-13 11:07:58.000000000 -0400
+++ rhpl-0.216/src/keyboard.py	2008-09-24 17:54:02.000000000 -0400
@@ -141,7 +141,7 @@ class Keyboard(SimpleConfigFile):
         if not os.environ.has_key("DISPLAY"):
             return
 
-        argv = [ "/usr/bin/setxkbmap", "-layout", layout, "-model", model ]
+        argv = [ "/usr/bin/setxkbmap", "-layout", layout ]
 
         # XXX setxkbmap(1) needs one -option flag for each option
         if options:


Index: rhpl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rhpl/devel/rhpl.spec,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- rhpl.spec	13 Jun 2008 15:07:32 -0000	1.115
+++ rhpl.spec	24 Sep 2008 21:55:34 -0000	1.116
@@ -3,7 +3,7 @@
 Summary: Library of Python code used by installation and configuration tools
 Name: rhpl
 Version: 0.216
-Release: 1
+Release: 2
 Source0: %{name}-%{version}.tar.bz2
 License: GPLv2+
 Group: System Environment/Libraries
@@ -16,11 +16,14 @@
 Conflicts: wireless-tools < 28-0.pre8.5
 Conflicts: kbd < 1.12-21
 
+Patch0: rhpl-0.216-no-model.patch
+
 %description
 The rhpl package contains Python code used throughout the system.
 
 %prep
 %setup -q
+%patch0 -p1 -b .model
 
 %build
 make
@@ -41,6 +44,10 @@
 %{python_sitearch}/rhpl
 
 %changelog
+* Wed Sep 24 2008 Adam Jackson <ajax at redhat.com> 0.216-2
+- rhpl-0.216-no-model.patch: Don't set XKB model, it's not meaningful for
+  evdev keyboards and it makes your arrow keys not work. (#461832)
+
 * Fri Jun 13 2008 Chris Lumens <clumens at redhat.com> 0.216-1
 - Fix Swiss French keyboard layout (#448878).
 - Now with more Romanian keyboard layouts! (#450381)