From 45d90804f503b5e44d8af4381b9d786d4572b723 Mon Sep 17 00:00:00 2001 From: CentOS Buildsys Date: Feb 13 2014 06:11:54 +0000 Subject: import xorg-x11-drv-wacom-0.23.0-6.el7.src.rpm --- diff --git a/SOURCES/70-wacom.rules b/SOURCES/70-wacom.rules index 2b32b12..f8fc4ff 100644 --- a/SOURCES/70-wacom.rules +++ b/SOURCES/70-wacom.rules @@ -9,7 +9,7 @@ SUBSYSTEM=="tty|pnp", SUBSYSTEMS=="pnp", ATTRS{id}=="WACf*", ENV{ID_MODEL}="Seri SUBSYSTEM=="tty|pnp", SUBSYSTEMS=="pnp", ATTRS{id}=="FUJ*", ENV{ID_MODEL}="Serial Wacom Tablet $attr{id}", ENV{ID_INPUT}="1", ENV{ID_INPUT_TABLET}="1", ENV{NAME}="Serial Wacom Tablet $attr{id}" # inputattach -SUBSYSTEM=="tty|pnp", KERNEL=="ttyS[0-9]*", ATTRS{id}=="WACf*", RUN+="/usr/sbin/modprobe wacom_w8001", RUN+="/usr/sbin/inputattach --daemon -w8001 /dev/%k" +SUBSYSTEM=="tty|pnp", KERNEL=="ttyS[0-9]*", ATTRS{id}=="WACf*", TAG+="systemd", ENV{SYSTEMD_WANTS}+="wacom-inputattach@%k.service" LABEL="wacom_end" diff --git a/SOURCES/wacom-inputattach@.service b/SOURCES/wacom-inputattach@.service new file mode 100644 index 0000000..3193d8a --- /dev/null +++ b/SOURCES/wacom-inputattach@.service @@ -0,0 +1,8 @@ +[Unit] +Description=inputattach for Wacom ISDv4-compatible serial devices + +[Service] +Type=simple +ExecStart=/usr/bin/inputattach -w8001 /dev/%I +Restart=on-success + diff --git a/SPECS/xorg-x11-drv-wacom.spec b/SPECS/xorg-x11-drv-wacom.spec index 70638aa..b04fe14 100644 --- a/SPECS/xorg-x11-drv-wacom.spec +++ b/SPECS/xorg-x11-drv-wacom.spec @@ -9,7 +9,7 @@ Summary: Xorg X11 wacom input driver Name: xorg-x11-drv-wacom Version: 0.23.0 -Release: 3%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Release: 6%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} URL: http://www.x.org License: GPLv2+ Group: User Interface/X Hardware Support @@ -22,6 +22,7 @@ Source2: commitid Source0: http://prdownloads.sourceforge.net/linuxwacom/xf86-input-wacom-%{version}.tar.bz2 %endif Source3: 70-wacom.rules +Source4: wacom-inputattach@.service Patch001: 0001-Threshold-applies-to-pen-tools-only.patch Patch002: 0002-Fix-missing-pad-expresskey-events-issue.patch @@ -33,10 +34,11 @@ BuildRequires: xorg-x11-server-devel >= 1.10.99.902 BuildRequires: xorg-x11-util-macros >= 1.3.0 BuildRequires: libX11-devel libXi-devel libXrandr-devel libXinerama-devel BuildRequires: autoconf automake libtool -BuildRequires: systemd-devel +BuildRequires: systemd systemd-devel Requires: Xorg %(xserver-sdk-abi-requires ansic) Requires: Xorg %(xserver-sdk-abi-requires xinput) +Requires: linuxconsoletools Provides: linuxwacom = %{version}-%{release} Obsoletes: linuxwacom <= 0.8.4.3 @@ -66,6 +68,8 @@ find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f -- install -d $RPM_BUILD_ROOT%{_prefix}/lib/udev/rules.d install -m 0644 %{SOURCE3} $RPM_BUILD_ROOT%{_prefix}/lib/udev/rules.d/70-wacom.rules +install -d $RPM_BUILD_ROOT%{_unitdir} +install -m 0644 %{SOURCE4} $RPM_BUILD_ROOT%{_unitdir}/wacom-inputattach@.service %clean rm -rf $RPM_BUILD_ROOT @@ -83,6 +87,7 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/X11/xorg.conf.d/50-wacom.conf %{_bindir}/xsetwacom %{_prefix}/lib/udev/rules.d/70-wacom.rules +%{_unitdir}/wacom-inputattach@.service %package devel Summary: Xorg X11 wacom input driver development package @@ -105,6 +110,15 @@ X.Org X11 wacom input driver development files. %{_bindir}/isdv4-serial-debugger %changelog +* Thu Feb 13 2014 Peter Hutterer 0.23.0-6 +- Use systemd for starting inputattach on serial devices (#1039445) + +* Wed Jan 15 2014 Adam Jackson - 0.23.0-5 +- 1.15 ABI rebuild + +* Fri Dec 27 2013 Daniel Mach - 0.23.0-4 +- Mass rebuild 2013-12-27 + * Wed Nov 06 2013 Adam Jackson - 0.23.0-3 - 1.15RC1 ABI rebuild