From ee0d993232377e9316aba969be0d1dfaba5a4877 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Apr 21 2015 05:38:50 +0000
Subject: Don't label touchscreens as touchpads (#1208685)


---

diff --git a/0001-tools-don-t-label-integrated-tablets-as-touchpads.patch b/0001-tools-don-t-label-integrated-tablets-as-touchpads.patch
new file mode 100644
index 0000000..c92d90f
--- /dev/null
+++ b/0001-tools-don-t-label-integrated-tablets-as-touchpads.patch
@@ -0,0 +1,35 @@
+From 7be498c17968261abadcc59a2d0dd9da2e70c629 Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Tue, 21 Apr 2015 10:39:55 +1000
+Subject: [PATCH libwacom] tools: don't label integrated tablets as touchpads
+
+If it's display- or system-integrated it can only be a touchscreen.
+
+Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+Tested-by: Benjamin Tissoires <benjamin.tissoires@gmail.com>
+---
+ tools/generate-udev-rules.c | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/tools/generate-udev-rules.c b/tools/generate-udev-rules.c
+index ff95e60..d6769bd 100644
+--- a/tools/generate-udev-rules.c
++++ b/tools/generate-udev-rules.c
+@@ -83,8 +83,12 @@ static void print_udev_entry_for_match (WacomDevice *device, const WacomMatch *m
+ 	/* unset joystick, set tablet */
+ 	printf ("%s ENV{ID_INPUT}=\"1\", ENV{ID_INPUT_JOYSTICK}=\"\", ENV{ID_INPUT_TABLET}=\"1\"\n", matchstr);
+ 
+-	if (libwacom_has_touch (device))
+-		printf( "ATTRS{name}==\"* Finger\", %s ENV{ID_INPUT_TOUCHPAD}=\"1\"\n", matchstr);
++	if (libwacom_has_touch (device)) {
++		const char *touchtype = "ID_INPUT_TOUCHPAD";
++		if (libwacom_get_integration_flags (device) != WACOM_DEVICE_INTEGRATED_NONE)
++			touchtype = "ID_INPUT_TOUCHSCREEN";
++		printf( "ATTRS{name}==\"* Finger\", %s ENV{%s}=\"1\"\n", matchstr, touchtype);
++	}
+ 
+ 	/* set ID_INPUT_TABLET_PAD for pads */
+ 	if (libwacom_get_num_buttons (device) > 0)
+-- 
+2.3.5
+
diff --git a/libwacom.spec b/libwacom.spec
index b993fe9..c84c8e8 100644
--- a/libwacom.spec
+++ b/libwacom.spec
@@ -2,7 +2,7 @@
 
 Name:           libwacom
 Version:        0.13
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Tablet Information Client Library
 Requires:       %{name}-data
 
@@ -12,6 +12,8 @@ URL:            http://linuxwacom.sourceforge.net
 
 Source0:        http://prdownloads.sourceforge.net/linuxwacom/%{name}/%{name}-%{version}.tar.bz2
 
+Patch01:        0001-tools-don-t-label-integrated-tablets-as-touchpads.patch
+
 BuildRequires:  autoconf automake libtool doxygen
 BuildRequires:  glib2-devel libgudev1-devel
 BuildRequires:  systemd-devel
@@ -38,6 +40,7 @@ Tablet information client library library data files.
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch01 -p1
 
 %build
 autoreconf --force -v --install || exit 1
@@ -81,6 +84,9 @@ rm -f %{buildroot}%{_libdir}/*.la
 %{_datadir}/libwacom/layouts/*.svg
 
 %changelog
+* Tue Apr 21 2015 Peter Hutterer <peter.hutterer@redhat.com> 0.13-2
+- Don't label touchscreens as touchpads (#1208685)
+
 * Mon Apr 20 2015 Peter Hutterer <peter.hutterer@redhat.com> 0.13-1
 - libwacom 0.13