Hello community, here is the log from the commit of package xf86-input-wacom for openSUSE:Factory checked in at 2014-01-08 20:36:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xf86-input-wacom (Old) and /work/SRC/openSUSE:Factory/.xf86-input-wacom.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xf86-input-wacom" Changes: -------- --- /work/SRC/openSUSE:Factory/xf86-input-wacom/xf86-input-wacom.changes 2013-12-11 17:40:19.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.xf86-input-wacom.new/xf86-input-wacom.changes 2014-01-08 20:36:16.000000000 +0100 @@ -1,0 +2,10 @@ +Wed Jan 8 13:26:55 UTC 2014 - [email protected] + +- Resync udev rules with Fedora one, add [email protected] + to attach tablet when plugged (additional dependency on + input-utils package for inputattach tool). +- Add systemd-rpm-macros (or systemd on old openSUSE release) to + BuildRequires for systemd service path macro. +- Notify udev to reload its rules on package install/upgrade. + +------------------------------------------------------------------- New: ---- [email protected] ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xf86-input-wacom.spec ++++++ --- /var/tmp/diff_new_pack.nDDzLk/_old 2014-01-08 20:36:17.000000000 +0100 +++ /var/tmp/diff_new_pack.nDDzLk/_new 2014-01-08 20:36:17.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package xf86-input-wacom # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -31,7 +31,13 @@ Url: http://sourceforge.net/apps/mediawiki/linuxwacom/index.php?title=Xf86-input-wacom Source0: http://downloads.sourceforge.net/project/linuxwacom/xf86-input-wacom/%{name}-%{version}.tar.bz2 Source1: 65-xorg-wacom.rules +Source2: [email protected] BuildRequires: pkg-config +%if %{suse_version} > 1230 +BuildRequires: systemd-rpm-macros +%else +BuildRequires: systemd +%endif # For directory ownership BuildRequires: udev BuildRequires: pkgconfig(inputproto) @@ -46,6 +52,7 @@ BuildRequires: pkgconfig(xorg-server) >= 1.7.0 BuildRequires: pkgconfig(xproto) BuildRequires: pkgconfig(xrandr) +Requires: input-utils Requires: udev Supplements: xorg-x11-server # This was part of the xorg-x11-driver-input package up to version 7.6 @@ -82,13 +89,33 @@ %make_install find %{buildroot}%{_libdir} -name '*.la' -type f -delete -print install -D -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_udevrulesdir}/65-xorg-wacom.rules +mkdir -p $RPM_BUILD_ROOT%_unitdir +install -D -m 644 %{SOURCE2} $RPM_BUILD_ROOT%_unitdir %post +test -n "$FIRST_ARG" || FIRST_ARG=$1 +if [ $FIRST_ARG -eq 1 ]; then +%if %suse_version > 1230 + %udev_rules_update +%else + udevadm control --reload >/dev/null 2>&1 || : \ +%endif + /usr/bin/systemctl daemon-reload >/dev/null 2>&1 || : +fi # re-plug the input devices udevadm trigger --subsystem-match=input --action=change exit 0 %postun +test -n "$FIRST_ARG" || FIRST_ARG=$1 +if [ $FIRST_ARG -le 1 ]; then +%if %suse_version > 1230 + %udev_rules_update +%else + udevadm control --reload >/dev/null 2>&1 || : \ +%endif + /usr/bin/systemctl daemon-reload >/dev/null 2>&1 || : +fi # re-plug the input devices udevadm trigger --subsystem-match=input --action=change exit 0 @@ -97,6 +124,7 @@ %defattr(-,root,root) %doc AUTHORS ChangeLog GPL README %{_udevrulesdir}/65-xorg-wacom.rules +%{_unitdir}/[email protected] %config %{_sysconfdir}/X11/xorg.conf.d/50-wacom.conf %dir %{_libdir}/xorg/modules/input %{_libdir}/xorg/modules/input/wacom_drv.so ++++++ 65-xorg-wacom.rules ++++++ --- /var/tmp/diff_new_pack.nDDzLk/_old 2014-01-08 20:36:17.000000000 +0100 +++ /var/tmp/diff_new_pack.nDDzLk/_new 2014-01-08 20:36:17.000000000 +0100 @@ -2,12 +2,13 @@ # Match all serial wacom tablets with a serial ID starting with WACf # Notes: We assign NAME though we shouldn't, but currently the server requires it -# We assign the lot to subsystem pnp too because server reads NAME from -# the parent device. Once all that's fixed, as simple SUBSYSTEM="tty" -# will do and the ENV{NAME} can be removed. -SUBSYSTEM=="tty|pnp", ATTR{id}=="WACf*", ENV{NAME}="Serial Wacom Tablet" -SUBSYSTEM=="tty|pnp", ATTR{id}=="FUJ*", ENV{NAME}="Serial Wacom Tablet" -SUBSYSTEMS=="tty|pnp", ATTRS{id}=="WACf*", ENV{ID_INPUT}="1", ENV{ID_INPUT_TABLET}="1", ENV{x11_driver}="wacom", ENV{ID_MODEL}="Serial Wacom Tablet $attr{id}" -SUBSYSTEMS=="tty|pnp", ATTRS{id}=="FUJ*", ENV{ID_INPUT}="1", ENV{ID_INPUT_TABLET}="1", ENV{x11_driver}="wacom", ENV{ID_MODEL}="Serial Wacom Tablet $attr{id}" +# We assign the lot to subsystem pnp too because server reads NAME from +# the parent device. Once all that's fixed, as simple SUBSYSTEM="tty" +# will do and the ENV{NAME} can be removed. +SUBSYSTEM=="tty|pnp", SUBSYSTEMS=="pnp", ATTRS{id}=="WACf*", ENV{ID_MODEL}="Serial Wacom Tablet $attr{id}", ENV{ID_INPUT}="1", ENV{ID_INPUT_TABLET}="1", ENV{NAME}="Serial Wacom Tablet $attr{id}", ENV{x11_driver}="wacom" +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}", ENV{x11_driver}="wacom" + +# inputattach +SUBSYSTEM=="tty|pnp", KERNEL=="ttyS[0-9]*", ATTRS{id}=="WACf*", TAG+="systemd", ENV{SYSTEMD_WANTS}+="wacom-inputattach@%k.service" LABEL="wacom_end" ++++++ [email protected] ++++++ [Unit] Description="inputattach for Wacom ISDv4-compatible serial devices" [Service] Type=simple ExecStart=/usr/bin/inputattach -w8001 /dev/%I -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
