rpms/xorg-x11-drv-evdev/F-10 evdev-2.0.6-force-rules-evdev.patch, NONE, 1.1 xorg-x11-drv-evdev.spec, 1.32, 1.33

[Peter Hutterer]

Author: whot

Update of /cvs/pkgs/rpms/xorg-x11-drv-evdev/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6553

Modified Files:
	xorg-x11-drv-evdev.spec 
Added Files:
	evdev-2.0.6-force-rules-evdev.patch 
Log Message:
* Wed Oct 8 2008 Peter Hutterer <peter.hutterer at redhat.com> 2.0.6-2
- evdev-2.0.6-force-rules-evdev.patch: force keyboard to use the evdev rules,
  not model. requires xkeyboard-config 1.4. (#457512)



evdev-2.0.6-force-rules-evdev.patch:

--- NEW FILE evdev-2.0.6-force-rules-evdev.patch ---
diff -up xf86-input-evdev-2.0.6/src/evdev.c.orig xf86-input-evdev-2.0.6/src/evdev.c
--- xf86-input-evdev-2.0.6/src/evdev.c.orig	2008-10-08 10:48:34.000000000 +1030
+++ xf86-input-evdev-2.0.6/src/evdev.c	2008-10-08 10:49:24.000000000 +1030
@@ -91,7 +91,7 @@
 
 
 static const char *evdevDefaults[] = {
-    "XkbRules",     "base",
+    "XkbRules",     "evdev",
     "XkbModel",     "evdev",
     "XkbLayout",    "us",
     NULL
@@ -728,12 +728,12 @@ EvdevAddKeyClass(DeviceIntPtr device)
 #ifdef XKB
     else
     {
+	/* sorry, no rules change allowed for you */
+	xf86ReplaceStrOption(pInfo->options, "xkb_rules", "evdev");
         SetXkbOption(pInfo, "xkb_rules", &pEvdev->xkb_rules);
-	if (!pEvdev->xkb_rules)
-	    SetXkbOption(pInfo, "XkbRules", &pEvdev->xkb_rules);
-	/* sorry, no model change allowed for you */
-	xf86ReplaceStrOption(pInfo->options, "xkb_model", "evdev");
         SetXkbOption(pInfo, "xkb_model", &pEvdev->xkb_model);
+	if (!pEvdev->xkb_model)
+	    SetXkbOption(pInfo, "XkbModel", &pEvdev->xkb_rules);
         SetXkbOption(pInfo, "xkb_layout", &pEvdev->xkb_layout);
 	if (!pEvdev->xkb_layout)
 	    SetXkbOption(pInfo, "XkbLayout", &pEvdev->xkb_layout);


Index: xorg-x11-drv-evdev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-evdev/F-10/xorg-x11-drv-evdev.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- xorg-x11-drv-evdev.spec	3 Oct 2008 07:34:57 -0000	1.32
+++ xorg-x11-drv-evdev.spec	8 Oct 2008 00:55:21 -0000	1.33
@@ -7,7 +7,7 @@
 Summary:    Xorg X11 evdev input driver
 Name:	    xorg-x11-drv-evdev
 Version:    2.0.6
-Release:    1%{?dist}
+Release:    2%{?dist}
 URL:	    http://www.x.org
 License:    MIT
 Group:	    User Interface/X Hardware Support
@@ -17,12 +17,16 @@
 #Source0:    %{tarball}-%{gitdate}.tar.bz2
 Source1:    make-git-snapshot.sh
 
+# Merged upstream but not in 2.0 branch
+Patch0001:  evdev-2.0.6-force-rules-evdev.patch
+
 ExcludeArch: s390 s390x
 
 BuildRequires: autoconf automake libtool
 BuildRequires: xorg-x11-server-sdk >= 1.3.0.0-6
 
 Requires:  xorg-x11-server-Xorg >= 1.3.0.0-6
+Requires:  xkeyboard-config >= 1.4-1
 
 %description 
 X.Org X11 evdev input driver.
@@ -32,6 +36,7 @@
 %setup -q -n %{tarball}-%{version}
 
 # apply patches
+%patch0001 -p1 -b .rules-evdev
 
 %build
 autoreconf -v --install || exit 1
@@ -56,6 +61,10 @@
 %{_mandir}/man4/evdev.4*
 
 %changelog
+* Wed Oct 8 2008 Peter Hutterer <peter.hutterer at redhat.com> 2.0.6-2
+- evdev-2.0.6-force-rules-evdev.patch: force keyboard to use the evdev rules,
+  not model. requires xkeyboard-config 1.4. (#457512)
+
 * Fri Oct 3 2008 Peter Hutterer <peter.hutterer at redhat.com> 2.0.6-1
 - update to 2.0.6
 - remove patches merged upstream.