[xorg-x11-drv-wacom] Fix udev rules file (thanks to Lennart): The subsystem cannot be assigned. Append the attrs to the d

[Peter Hutterer]

commit 10eded9ff480acd732a8f6b6f38b5ae7f501cdd9
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Wed Jul 20 13:57:36 2011 +1000

    Fix udev rules file (thanks to Lennart):
    The subsystem cannot be assigned.
    Append the attrs to the device name
    Match only on tty/pnp

 70-wacom.rules          |    4 ++--
 xorg-x11-drv-wacom.spec |    8 +++++++-
 2 files changed, 9 insertions(+), 3 deletions(-)
---
diff --git a/70-wacom.rules b/70-wacom.rules
index 67e5580..3c010f1 100644
--- a/70-wacom.rules
+++ b/70-wacom.rules
@@ -1,8 +1,8 @@
 ACTION!="add|change", GOTO="wacom_end"
 
 # Match all wacom tablets with a serial ID starting with WACf
-ATTRS{id}=="WACf*" ENV{NAME}="Serial Wacom Tablet", ENV{SUBSYSTEM}="input", ENV{ID_INPUT}="1", ENV{ID_INPUT_TABLET}="1"
-ATTRS{id}=="FUJ*" ENV{NAME}="Serial Wacom Tablet", ENV{SUBSYSTEM}="input", ENV{ID_INPUT}="1", ENV{ID_INPUT_TABLET}="1"
+SUBSYSTEM="tty", SUBSYSTEMS="pnp", ATTRS{id}=="WACf*", ENV{ID_MODEL}="Serial Wacom Tablet $attr{id}", ENV{ID_INPUT}="1", ENV{ID_INPUT_TABLET}="1"
+SUBSYSTEM="tty", SUBSYSTEMS="pnp", ATTRS{id}=="FUJ*", ENV{ID_MODEL}="Serial Wacom Tablet $attr{id}", ENV{ID_INPUT}="1", ENV{ID_INPUT_TABLET}="1"
 
 LABEL="wacom_end"
 
diff --git a/xorg-x11-drv-wacom.spec b/xorg-x11-drv-wacom.spec
index 332d102..be5190e 100644
--- a/xorg-x11-drv-wacom.spec
+++ b/xorg-x11-drv-wacom.spec
@@ -8,7 +8,7 @@
 Summary:    Xorg X11 wacom input driver
 Name:       xorg-x11-drv-wacom
 Version:    0.11.99
-Release:    1%{?gitdate:.%{gitdate}}%{?dist}
+Release:    2%{?gitdate:.%{gitdate}}%{?dist}
 URL:        http://www.x.org
 License:    GPLv2+
 Group:      User Interface/X Hardware Support
@@ -97,6 +97,12 @@ X.Org X11 wacom input driver development files.
 %{_bindir}/isdv4-serial-debugger
 
 %changelog
+* Wed Jul 20 2011 Peter Hutterer <peter.hutterer at redhat.com> 0.11.99-2.20110527
+- Fix udev rules file (thanks to Lennart):
+  - The subsystem cannot be assigned.
+  - Append the attrs to the device name
+  - Match only on tty/pnp
+
 * Thu Jul 07 2011 Peter Hutterer <peter.hutterer at redhat.com>
 - Disable silent rules on build