rpms/xorg-x11-drv-vmmouse/F-13 vmmouse-12.6.9-single-udev-match.patch, NONE, 1.1 xorg-x11-drv-vmmouse.spec, 1.36, 1.37

[Peter Hutterer]

Author: whot

Update of /cvs/pkgs/rpms/xorg-x11-drv-vmmouse/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv26121

Modified Files:
	xorg-x11-drv-vmmouse.spec 
Added Files:
	vmmouse-12.6.9-single-udev-match.patch 
Log Message:
* Fri Jun 18 2010 Peter Hutterer <peter.hutterer at redhat.com> 12.6.9-3
- vmmouse-12.6.9-single-udev-match.patch: only match event devices once.


vmmouse-12.6.9-single-udev-match.patch:
 69-xorg-vmmouse.rules.in |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE vmmouse-12.6.9-single-udev-match.patch ---
>From 1d1c0514158abb66388ee4eb44764d201203a863 Mon Sep 17 00:00:00 2001
From: Jakob Bornecrantz <jakob at vmware.com>
Date: Mon, 19 Apr 2010 15:29:41 +0100
Subject: [PATCH] Only match against event[0-9] in udev rules

It looks like the udev rule was matched against two devices which caused
the driver to be loaded twice. We shouldn't match against the other
device because it will very seldom send bogus events. Some of the bug
this caused was buttons getting stuck.
---
 tools/69-xorg-vmmouse.rules.in |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/tools/69-xorg-vmmouse.rules.in b/tools/69-xorg-vmmouse.rules.in
index 0d7f028..602afb6 100644
--- a/tools/69-xorg-vmmouse.rules.in
+++ b/tools/69-xorg-vmmouse.rules.in
@@ -1 +1 @@
-ACTION=="add|change", ENV{ID_INPUT_MOUSE}=="?*", ATTRS{description}=="i8042 AUX port", PROGRAM="__BIN_PREFIX__/vmmouse_detect", ENV{ID_INPUT.tags}="vmmouse"
+ACTION=="add|change", ENV{ID_INPUT_MOUSE}=="?*", ATTRS{description}=="i8042 AUX port", KERNEL=="event[0-9]*", PROGRAM="__BIN_PREFIX__/vmmouse_detect", ENV{ID_INPUT.tags}="vmmouse"
-- 
1.7.0.1



Index: xorg-x11-drv-vmmouse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-vmmouse/F-13/xorg-x11-drv-vmmouse.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- xorg-x11-drv-vmmouse.spec	15 Apr 2010 05:30:32 -0000	1.36
+++ xorg-x11-drv-vmmouse.spec	20 Jun 2010 23:42:23 -0000	1.37
@@ -5,7 +5,7 @@
 Summary:    Xorg X11 vmmouse input driver
 Name:	    xorg-x11-drv-vmmouse
 Version:    12.6.9
-Release:    2%{?dist}
+Release:    3%{?dist}
 URL:	    http://www.x.org
 License:    MIT
 Group:	    User Interface/X Hardware Support
@@ -13,6 +13,8 @@ BuildRoot:  %{_tmppath}/%{name}-%{versio
 
 Source0:    ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
 
+Patch1:     vmmouse-12.6.9-single-udev-match.patch
+
 # Yes, this is not the same as vmware.  Yes, this is intentional.
 ExclusiveArch: %{ix86} x86_64
 
@@ -26,6 +28,7 @@ X.Org X11 vmmouse input driver.
 
 %prep
 %setup -q -n %{tarball}-%{version}
+%patch1 -p1 
 
 %build
 %configure --disable-static --with-xorg-conf-dir='%{_datadir}/X11/xorg.conf.d'
@@ -56,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT
 /lib/udev/rules.d/*.rules 
 
 %changelog
+* Fri Jun 18 2010 Peter Hutterer <peter.hutterer at redhat.com> 12.6.9-3
+- vmmouse-12.6.9-single-udev-match.patch: only match event devices once.
+
 * Thu Apr 15 2010 Peter Hutterer <peter.hutterer at redhat.com> 12.6.9-2
 - Install config snippet in $datadir/X11/xorg.conf.d.