[libwacom/f17] Fix udev rules generator patch to apply ENV{ID_INPUT_TOUCHPAD} correctly (#803314)
Peter Hutterer
whot at fedoraproject.org
Thu Mar 22 05:48:48 UTC 2012
commit 5e5254b091d2fd77f683f42dd49c70d26ffb3a17
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date: Thu Mar 22 15:51:08 2012 +1000
Fix udev rules generator patch to apply ENV{ID_INPUT_TOUCHPAD} correctly (#803314)
libwacom-0.3-add-udev-generator.patch | 2 +-
libwacom.rules | 4 ++--
libwacom.spec | 6 +++++-
3 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/libwacom-0.3-add-udev-generator.patch b/libwacom-0.3-add-udev-generator.patch
index 44438f5..9070c0d 100644
--- a/libwacom-0.3-add-udev-generator.patch
+++ b/libwacom-0.3-add-udev-generator.patch
@@ -77,7 +77,7 @@ index 0000000..de3986f
+ static char *touchpad;
+
+ if (has_touch)
-+ touchpad = ", ID_INPUT_TOUCHPAD=\"1\"";
++ touchpad = ", ENV{ID_INPUT_TOUCHPAD}=\"1\"";
+ else
+ touchpad = "";
+
diff --git a/libwacom.rules b/libwacom.rules
index 114e257..4b13efc 100644
--- a/libwacom.rules
+++ b/libwacom.rules
@@ -21,7 +21,7 @@ ENV{ID_BUS}=="usb", ENV{ID_VENDOR_ID}=="056a", ENV{ID_MODEL_ID}=="0020", ENV{ID_
ENV{ID_BUS}=="usb", ENV{ID_VENDOR_ID}=="056a", ENV{ID_MODEL_ID}=="00c5", ENV{ID_INPUT}="1", ENV{ID_INPUT_TABLET}="1"
ENV{ID_BUS}=="usb", ENV{ID_VENDOR_ID}=="056a", ENV{ID_MODEL_ID}=="00cc", ENV{ID_INPUT}="1", ENV{ID_INPUT_TABLET}="1"
ENV{ID_BUS}=="usb", ENV{ID_VENDOR_ID}=="056a", ENV{ID_MODEL_ID}=="00b3", ENV{ID_INPUT}="1", ENV{ID_INPUT_TABLET}="1"
-ENV{ID_BUS}=="usb", ENV{ID_VENDOR_ID}=="056a", ENV{ID_MODEL_ID}=="00d1", ENV{ID_INPUT}="1", ENV{ID_INPUT_TABLET}="1", ID_INPUT_TOUCHPAD="1"
+ENV{ID_BUS}=="usb", ENV{ID_VENDOR_ID}=="056a", ENV{ID_MODEL_ID}=="00d1", ENV{ID_INPUT}="1", ENV{ID_INPUT_TABLET}="1", ENV{ID_INPUT_TOUCHPAD}="1"
ENV{ID_BUS}=="usb", ENV{ID_VENDOR_ID}=="056a", ENV{ID_MODEL_ID}=="0014", ENV{ID_INPUT}="1", ENV{ID_INPUT_TABLET}="1"
ENV{ID_BUS}=="usb", ENV{ID_VENDOR_ID}=="056a", ENV{ID_MODEL_ID}=="003f", ENV{ID_INPUT}="1", ENV{ID_INPUT_TABLET}="1"
ENV{ID_BUS}=="bluetooth", ENV{ID_VENDOR_ID}=="056a", ENV{ID_MODEL_ID}=="0081", ENV{ID_INPUT}="1", ENV{ID_INPUT_TABLET}="1"
@@ -36,7 +36,7 @@ ENV{ID_BUS}=="usb", ENV{ID_VENDOR_ID}=="056a", ENV{ID_MODEL_ID}=="00b4", ENV{ID_
ENV{ID_BUS}=="usb", ENV{ID_VENDOR_ID}=="056a", ENV{ID_MODEL_ID}=="00b2", ENV{ID_INPUT}="1", ENV{ID_INPUT_TABLET}="1"
ENV{ID_BUS}=="usb", ENV{ID_VENDOR_ID}=="056a", ENV{ID_MODEL_ID}=="00b1", ENV{ID_INPUT}="1", ENV{ID_INPUT_TABLET}="1"
ENV{ID_BUS}=="usb", ENV{ID_VENDOR_ID}=="056a", ENV{ID_MODEL_ID}=="00b0", ENV{ID_INPUT}="1", ENV{ID_INPUT_TABLET}="1"
-ENV{ID_BUS}=="usb", ENV{ID_VENDOR_ID}=="056a", ENV{ID_MODEL_ID}=="003e", ENV{ID_INPUT}="1", ENV{ID_INPUT_TABLET}="1", ID_INPUT_TOUCHPAD="1"
+ENV{ID_BUS}=="usb", ENV{ID_VENDOR_ID}=="056a", ENV{ID_MODEL_ID}=="003e", ENV{ID_INPUT}="1", ENV{ID_INPUT_TABLET}="1", ENV{ID_INPUT_TOUCHPAD}="1"
# Match all serial wacom tablets with a serial ID starting with WACf
ENV{ID_BUS}=="tty|pnp", ATTRS{id}=="WACf*", ENV{ID_INPUT}="1", ENV{ID_INPUT_TABLET}="1"
diff --git a/libwacom.spec b/libwacom.spec
index 16039f4..214974f 100644
--- a/libwacom.spec
+++ b/libwacom.spec
@@ -1,6 +1,6 @@
Name: libwacom
Version: 0.3
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Tablet Information Client Library
Requires: %{name}-data
@@ -84,6 +84,10 @@ rm -f %{buildroot}%{_libdir}/*.la
%{_datadir}/libwacom/*.stylus
%changelog
+* Thu Mar 22 2012 Peter Hutterer <peter.hutterer at redhat.com> 0.3-6
+- Fix udev rules generator patch to apply ENV{ID_INPUT_TOUCHPAD} correctly
+ (#803314)
+
* Thu Mar 08 2012 Olivier Fourdan <ofourdan at redhat.com> 0.3-5
- Mark data subpackage as noarch and make it a requirement for libwacom
- Use generated udev rule file to list only known devices from libwacom
More information about the scm-commits
mailing list