From 9f0ff2b481c7ff3dd7eb3a368ffb3b047d087369 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue, 1 Nov 2016 11:16:24 +1000
Subject: [PATCH] Match against tablets too

---
 0001-conf-match-against-tablets-too.patch | 31 +++++++++++++++++++++++
 xorg-x11-drv-libinput.spec                |  8 +++++-
 2 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 0001-conf-match-against-tablets-too.patch

diff --git a/0001-conf-match-against-tablets-too.patch b/0001-conf-match-against-tablets-too.patch
new file mode 100644
index 0000000..1ec7f67
--- /dev/null
+++ b/0001-conf-match-against-tablets-too.patch
@@ -0,0 +1,31 @@
+From c4f0a9bcb846f70b85a285e8acea8fe086abdccb Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Tue, 1 Nov 2016 10:06:03 +1000
+Subject: [PATCH xf86-input-libinput] conf: match against tablets too
+
+Now that we sort below the xf86-input-wacom driver anyway, there's no good
+reason to ignore tablets anymore.
+
+Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+---
+ conf/40-libinput.conf | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/conf/40-libinput.conf b/conf/40-libinput.conf
+index 97afd07..7b7162e 100644
+--- a/conf/40-libinput.conf
++++ b/conf/40-libinput.conf
+@@ -26,3 +26,10 @@ Section "InputClass"
+         MatchDevicePath "/dev/input/event*"
+         Driver "libinput"
+ EndSection
++
++Section "InputClass"
++        Identifier "libinput tablet catchall"
++        MatchIsTablet "on"
++        MatchDevicePath "/dev/input/event*"
++        Driver "libinput"
++EndSection
+-- 
+2.9.3
+
diff --git a/xorg-x11-drv-libinput.spec b/xorg-x11-drv-libinput.spec
index e0e3ee0..63efc99 100644
--- a/xorg-x11-drv-libinput.spec
+++ b/xorg-x11-drv-libinput.spec
@@ -8,7 +8,7 @@
 Summary:    Xorg X11 libinput input driver
 Name:       xorg-x11-drv-libinput
 Version:    0.22.0
-Release:    1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
+Release:    2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
 URL:        http://www.x.org
 License:    MIT
 
@@ -18,6 +18,8 @@ Source0:    %{tarball}-%{gitdate}.tar.xz
 Source0:    ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
 %endif
 
+Patch01:    0001-conf-match-against-tablets-too.patch
+
 ExcludeArch: s390 s390x
 
 BuildRequires: autoconf automake libtool
@@ -36,6 +38,7 @@ supporting all devices.
 
 %prep
 %setup -q -n %{tarball}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}}
+%patch01 -p1 01
 
 %build
 autoreconf --force -v --install || exit 1
@@ -73,6 +76,9 @@ Xorg X11 libinput input driver development files.
 %{_includedir}/xorg/libinput-properties.h
 
 %changelog
+* Tue Nov 01 2016 Peter Hutterer <peter.hutterer@redhat.com> 0.22.0-2
+- Match against tablets too
+
 * Wed Oct 19 2016 Peter Hutterer <peter.hutterer@redhat.com> 0.22.0-1
 - xf86-input-libinput 0.22.0