diff --git a/.gitignore b/.gitignore index a0c3cd9..59eaf48 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /libwacom-0.11.tar.bz2 /libwacom-0.12.tar.bz2 /libwacom-0.13.tar.bz2 +/libwacom-0.15.tar.bz2 diff --git a/0001-tools-don-t-label-integrated-tablets-as-touchpads.patch b/0001-tools-don-t-label-integrated-tablets-as-touchpads.patch deleted file mode 100644 index c92d90f..0000000 --- a/0001-tools-don-t-label-integrated-tablets-as-touchpads.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 7be498c17968261abadcc59a2d0dd9da2e70c629 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -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 -Tested-by: Benjamin Tissoires ---- - 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 9a057ff..3fc886a 100644 --- a/libwacom.spec +++ b/libwacom.spec @@ -1,8 +1,8 @@ %global udevdir %(pkg-config --variable=udevdir udev) Name: libwacom -Version: 0.13 -Release: 3%{?dist} +Version: 0.15 +Release: 1%{?dist} Summary: Tablet Information Client Library Requires: %{name}-data @@ -12,8 +12,6 @@ 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 @@ -40,7 +38,6 @@ Tablet information client library library data files. %prep %setup -q -n %{name}-%{version} -%patch01 -p1 %build autoreconf --force -v --install || exit 1 @@ -84,6 +81,9 @@ rm -f %{buildroot}%{_libdir}/*.la %{_datadir}/libwacom/layouts/*.svg %changelog +* Wed Jul 08 2015 Peter Hutterer 0.15-1 +- libwacom 0.15 + * Wed Jun 17 2015 Fedora Release Engineering - 0.13-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/sources b/sources index 294fd6d..fefd488 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8a48b16a9c0b55209ddcefbf66a64462 libwacom-0.13.tar.bz2 +692f0e7b10d6587c344ba5970f11bbb3 libwacom-0.15.tar.bz2