[xorg-x11-drv-wacom] Fix udev rules file again: use ==, not = to compare subsystems assign ENV{NAME} even though we shoul

[Peter Hutterer]

commit 1fe30fc052556090e1850f5aa1878448aa2a38f5
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Thu Jul 21 11:04:29 2011 +1000

    Fix udev rules file again:
    use ==, not = to compare subsystems
    assign ENV{NAME} even though we shouldn't, the server currently requires it
    assign the lot to subsystem pnp too, that's where the server reads it
    from

 70-wacom.rules          |   10 +++++++---
 xorg-x11-drv-wacom.spec |    9 ++++++++-
 2 files changed, 15 insertions(+), 4 deletions(-)
---
diff --git a/70-wacom.rules b/70-wacom.rules
index 3c010f1..f6aa208 100644
--- a/70-wacom.rules
+++ b/70-wacom.rules
@@ -1,8 +1,12 @@
 ACTION!="add|change", GOTO="wacom_end"
 
-# Match all wacom tablets with a serial ID starting with WACf
-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"
+# Match all serial wacom tablets with a serial ID starting with WACf
+# Notes: We assign NAME though we shouldn't, but currently the server requires it
+#        We assign the lot to subsystem pnp too because server reads NAME from
+#        the parent device. Once all that's fixed, as simple SUBSYSTEM="tty"
+#        will do and the ENV{NAME} can be removed.
+SUBSYSTEM=="tty|pnp", SUBSYSTEMS=="pnp", ATTRS{id}=="WACf*", ENV{ID_MODEL}="Serial Wacom Tablet $attr{id}", ENV{ID_INPUT}="1", ENV{ID_INPUT_TABLET}="1", ENV{NAME}="Serial Wacom Tablet $attr{id}"
+SUBSYSTEM=="tty|pnp", SUBSYSTEMS=="pnp", ATTRS{id}=="FUJ*", ENV{ID_MODEL}="Serial Wacom Tablet $attr{id}", ENV{ID_INPUT}="1", ENV{ID_INPUT_TABLET}="1", ENV{NAME}="Serial Wacom Tablet $attr{id}"
 
 LABEL="wacom_end"
 
diff --git a/xorg-x11-drv-wacom.spec b/xorg-x11-drv-wacom.spec
index be5190e..ef72905 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:    2%{?gitdate:.%{gitdate}}%{?dist}
+Release:    3%{?gitdate:.%{gitdate}}%{?dist}
 URL:        http://www.x.org
 License:    GPLv2+
 Group:      User Interface/X Hardware Support
@@ -97,6 +97,13 @@ X.Org X11 wacom input driver development files.
 %{_bindir}/isdv4-serial-debugger
 
 %changelog
+* Thu Jul 21 2011 Peter Hutterer <peter.hutterer at redhat.com> * 0.11.99-3.20110527
+- Fix udev rules file again:
+  - use ==, not = to compare subsystems
+  - assign ENV{NAME} even though we shouldn't, the server currently requires it
+  - assign the lot to subsystem pnp too, that's where the server reads it
+    from
+
 * 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.