[xorg-x11-drv-wacom/f20] Use systemd for starting inputattach

[Peter Hutterer]

commit ad91d061f0517d388eb617e2e313d1eaf50dc890
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Mon Dec 9 14:11:15 2013 +1000

    Use systemd for starting inputattach

 70-wacom.rules             |    2 +-
 wacom-inputattach at .service |    7 +++++++
 xorg-x11-drv-wacom.spec    |   12 ++++++++++--
 3 files changed, 18 insertions(+), 3 deletions(-)
---
diff --git a/70-wacom.rules b/70-wacom.rules
index 2b32b12..f8fc4ff 100644
--- a/70-wacom.rules
+++ b/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/wacom-inputattach at .service b/wacom-inputattach at .service
new file mode 100644
index 0000000..eab8e69
--- /dev/null
+++ b/wacom-inputattach at .service
@@ -0,0 +1,7 @@
+[Unit]
+Description="inputattach for Wacom ISDv4-compatible serial devices"
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/inputattach -w8001 /dev/%I
+
diff --git a/xorg-x11-drv-wacom.spec b/xorg-x11-drv-wacom.spec
index 8ab2c04..13cd92c 100644
--- a/xorg-x11-drv-wacom.spec
+++ b/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:    1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
+Release:    2%{?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 at .service
 
 ExcludeArch: s390 s390x
 
@@ -29,10 +30,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
@@ -59,6 +61,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 at .service
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -76,6 +80,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 at .service
 
 %package devel
 Summary:    Xorg X11 wacom input driver development package
@@ -98,6 +103,9 @@ X.Org X11 wacom input driver development files.
 %{_bindir}/isdv4-serial-debugger
 
 %changelog
+* Mon Dec 09 2013 Peter Hutterer <peter.hutterer at redhat.com> 0.23.0-2
+- Use systemd for starting inputattach
+
 * Sat Sep 28 2013 Peter Hutterer <peter.hutterer at redhat.com> 0.23.0-1
 - wacom 0.23.0