From cbefc10a005e85fc5afedeb0bbe8ac0219e9162f Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Thu, 20 May 2010 23:27:33 +0000 Subject: [PATCH] - Update to today's git snapshot. - wacom-0.10.6-serial-identifiers.patch: drop, upstream. --- .cvsignore | 2 +- 70-wacom.rules | 7 ++++++ sources | 2 +- wacom-0.10.6-serial-identifiers.patch | 32 --------------------------- xorg-x11-drv-wacom.spec | 21 +++++++++++++----- 5 files changed, 24 insertions(+), 40 deletions(-) create mode 100644 70-wacom.rules delete mode 100644 wacom-0.10.6-serial-identifiers.patch diff --git a/.cvsignore b/.cvsignore index 8641c96..3b6265b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xf86-input-wacom-20100427.tar.bz2 +xf86-input-wacom-20100521.tar.bz2 diff --git a/70-wacom.rules b/70-wacom.rules new file mode 100644 index 0000000..134d7c9 --- /dev/null +++ b/70-wacom.rules @@ -0,0 +1,7 @@ +ACTION!="add|change", GOTO="wacom_end" + +# Match all wacom tablets with a serial ID starting with WACf +ATTRS{id}=="WACf*" ENV{NAME}="Serial Wacom Tablet", ENV{SUBSYSTEM}="input", ENV{ID_INPUT}="1" + +LABEL="wacom_end" + diff --git a/sources b/sources index db2ca19..592b2bd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bd36357f284c058038895a9baa8d08ef xf86-input-wacom-20100427.tar.bz2 +5edcee183c28307e253774ef041b04c1 xf86-input-wacom-20100521.tar.bz2 diff --git a/wacom-0.10.6-serial-identifiers.patch b/wacom-0.10.6-serial-identifiers.patch deleted file mode 100644 index 9859c7c..0000000 --- a/wacom-0.10.6-serial-identifiers.patch +++ /dev/null @@ -1,32 +0,0 @@ -From a9746a469b522dded6828851617b3f3ee8c1bf89 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Tue, 27 Apr 2010 13:51:17 +1000 -Subject: [PATCH] conf: add WACf, FUJ02e5 and FUJ02e7 to serial identifers. - -Signed-off-by: Peter Hutterer ---- - conf/50-wacom.conf | 8 ++++++++ - 1 files changed, 8 insertions(+), 0 deletions(-) - -diff --git a/conf/50-wacom.conf b/conf/50-wacom.conf -index e1869e9..9a02b0e 100644 ---- a/conf/50-wacom.conf -+++ b/conf/50-wacom.conf -@@ -15,6 +15,14 @@ Section "InputClass" - Option "ForceDevice" "ISDV4" - EndSection - -+Section "InputClass" -+ Identifier "Wacom serial class identifiers" -+ MatchProduct "WACf|FUJ02e5|FUJ02e7" -+ Driver "wacom" -+ Option "ForceDevice" "ISDV4" -+EndSection -+ -+ - # N-Trig Duosense Electromagnetic Digitizer - Section "InputClass" - Identifier "Wacom N-Trig class" --- -1.6.6.1 - diff --git a/xorg-x11-drv-wacom.spec b/xorg-x11-drv-wacom.spec index b5da577..257ccb7 100644 --- a/xorg-x11-drv-wacom.spec +++ b/xorg-x11-drv-wacom.spec @@ -3,12 +3,12 @@ %global driverdir %{moduledir}/input # Disable gitdate to build from a fixed release -%global gitdate 20100427 +%global gitdate 20100521 Summary: Xorg X11 wacom input driver Name: xorg-x11-drv-wacom Version: 0.10.6 -Release: 2%{?gitdate:.%{gitdate}}%{?dist} +Release: 4%{?gitdate:.%{gitdate}}%{?dist} URL: http://www.x.org License: GPLv2+ Group: User Interface/X Hardware Support @@ -19,8 +19,7 @@ Source0: %{tarball}-%{gitdate}.tar.bz2 %else Source0: http://prdownloads.sourceforge.net/linuxwacom/xf86-input-wacom-%{version}.tar.bz2 %endif - -Patch01: wacom-0.10.6-serial-identifiers.patch +Source1: 70-wacom.rules ExcludeArch: s390 s390x @@ -30,6 +29,7 @@ BuildRequires: libX11-devel libXi-devel Requires: xorg-x11-server-Xorg >= 1.8.0-6 Requires: libX11 libXi +Requires: udev Provides: linuxwacom = %{version}-%{release} Obsoletes: linuxwacom <= 0.8.4.3 @@ -40,8 +40,6 @@ X.Org X11 wacom input driver for Wacom tablets. %prep %setup -q -n %{tarball}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}} -%patch01 -p1 - %build %if 0%{?gitdate} autoreconf -v --install || exit 1 @@ -61,6 +59,9 @@ find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f -- install -d $RPM_BUILD_ROOT%{_datadir}/X11/xorg.conf.d +install -d $RPM_BUILD_ROOT/lib/udev/rules.d +install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT/lib/udev/rules.d/70-wacom.rules + %clean rm -rf $RPM_BUILD_ROOT @@ -75,6 +76,7 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man4/wacom.4* %{_datadir}/X11/xorg.conf.d/50-wacom.conf %{_bindir}/xsetwacom +/lib/udev/rules.d/70-wacom.rules %package devel Summary: Xorg X11 wacom input driver development package @@ -93,6 +95,13 @@ X.Org X11 wacom input driver development files. %{_includedir}/xorg/wacom-properties.h %changelog +* Fri May 21 2010 Peter Hutterer 0.10.6-4.20100521 +- Update to today's git snapshot. +- wacom-0.10.6-serial-identifiers.patch: drop, upstream. + +* Tue May 18 2010 Peter Hutterer 0.10.6-3.20100427 +- Install wacom udev rules file to identify serial devices. + * Tue Apr 27 2010 Peter Hutterer 0.10.6-2.20100427 - wacom-0.10.6-serial-identifiers.patch: add some more serial IDs to the config file.