commit ebf4468b298774cc4e983fdc9f46c872632e185f
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date: Thu Feb 5 12:13:49 2015 +1000
Fix missing bits and bobs for the X1 Carbon quirks (#1189329)
50-synaptics.conf | 7 +++++++
xorg-x11-drv-synaptics.spec | 21 +++++++++++++++------
2 files changed, 22 insertions(+), 6 deletions(-)
---
diff --git a/50-synaptics.conf b/50-synaptics.conf
index 16b5742..cda37d3 100644
--- a/50-synaptics.conf
+++ b/50-synaptics.conf
@@ -67,3 +67,10 @@ Section "InputClass"
MatchTag "touchpad_softbutton_top"
Option "HasSecondarySoftButtons" "on"
EndSection
+
+Section "InputClass"
+ Identifier "Lenovo *50 and Carbon 3rd trackpoint buttons"
+ MatchDriver "synaptics"
+ MatchTag "has_trackpoint_buttons"
+ Option "HasTrackpointButtons" "on"
+EndSection
diff --git a/xorg-x11-drv-synaptics.spec b/xorg-x11-drv-synaptics.spec
index 49709c7..a5a6269 100644
--- a/xorg-x11-drv-synaptics.spec
+++ b/xorg-x11-drv-synaptics.spec
@@ -8,7 +8,7 @@
Name: xorg-x11-drv-synaptics
Summary: Xorg X11 Synaptics touchpad input driver
Version: 1.8.1
-Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
+Release: 3%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
URL: http://www.x.org
License: MIT
Group: User Interface/X Hardware Support
@@ -33,6 +33,7 @@ BuildRequires: xorg-x11-server-devel >= 1.10.99.902
BuildRequires: libX11-devel libXi-devel libXtst-devel
BuildRequires: xorg-x11-util-macros >= 1.8.0
BuildRequires: libevdev-devel
+BuildRequires: systemd
Requires: Xorg %(xserver-sdk-abi-requires ansic)
Requires: Xorg %(xserver-sdk-abi-requires xinput)
@@ -97,7 +98,7 @@ git am -p1 %{patches} < /dev/null
%build
autoreconf -v --install --force || exit 1
-%configure --disable-static --disable-silent-rules
+%configure --disable-static --disable-silent-rules --with-udev-rules-dir=%{_udevrulesdir}
make %{?_smp_mflags}
%install
@@ -110,9 +111,14 @@ find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f --
install -d $RPM_BUILD_ROOT%{_datadir}/X11/xorg.conf.d
install -m 0644 %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/X11/xorg.conf.d/50-synaptics.conf
-install -d $RPM_BUILD_ROOT%{_prefix}/lib/udev/rules.d/
-install -m 0644 %{SOURCE4} $RPM_BUILD_ROOT%{_prefix}/lib/udev/rules.d/70-touchpad-quirks.rules
+install -d $RPM_BUILD_ROOT%{_udevrulesdir}
+install -m 0644 %{SOURCE4} $RPM_BUILD_ROOT%{_udevrulesdir}/70-touchpad-quirks.rules
+%post
+udevadm control --reload-rules || :
+
+%postun
+udevadm control --reload-rules || :
%files
%doc COPYING
@@ -124,7 +130,8 @@ install -m 0644 %{SOURCE4} $RPM_BUILD_ROOT%{_prefix}/lib/udev/rules.d/70-touchpa
%{_mandir}/man1/synclient.1*
%{_mandir}/man1/syndaemon.1*
%doc COPYING README
-%{_prefix}/lib/udev/rules.d/70-touchpad-quirks.rules
+%{_udevrulesdir}/70-touchpad-quirks.rules
+%{_udevrulesdir}/71-synaptics.rules
%package devel
Summary: Xorg X11 synaptics input driver
@@ -139,9 +146,11 @@ Development files for the Synaptics TouchPad for X.Org.
%{_libdir}/pkgconfig/xorg-synaptics.pc
%dir %{_includedir}/xorg
%{_includedir}/xorg/synaptics-properties.h
-%{_libdir}/udev/rules.d/71-synaptics.rules
%changelog
+* Thu Feb 05 2015 Peter Hutterer <peter.hutterer at redhat.com> 1.8.1-3
+- Fix missing bits and bobs for the X1 Carbon quirks (#1189329)
+
* Mon Feb 02 2015 Peter Hutterer <peter.hutterer at redhat.com> 1.8.1-2
- Add support for the X1 Carbon 3rd quirks