[xorg-x11-drv-synaptics] Set Option "HasSecondarySoftButtons" "on" in 50-synaptics.conf for devices

[Hans de Goede]

commit a6e63991790dbd2e3acec61f544c0ce3f0ec9c1b
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Wed May 14 12:30:21 2014 +0200

    Set Option "HasSecondarySoftButtons" "on" in 50-synaptics.conf for devices
    
      with the touchpad_softbutton_top udev quirk, to keep topbuttons working on
      kernels which don't set INPUT_PROP_TOPBUTTONPAD
    - Add W540 to 70-touchpad-quirks.rules as touchpad_softbutton_top (#1096436)

 50-synaptics.conf           |    3 ++-
 70-touchpad-quirks.rules    |    1 +
 xorg-x11-drv-synaptics.spec |    8 +++++++-
 3 files changed, 10 insertions(+), 2 deletions(-)
---
diff --git a/50-synaptics.conf b/50-synaptics.conf
index b670a51..16b5742 100644
--- a/50-synaptics.conf
+++ b/50-synaptics.conf
@@ -12,6 +12,7 @@ Section "InputClass"
         Identifier "Default clickpad buttons"
         MatchDriver "synaptics"
         Option "SoftButtonAreas" "50% 0 82% 0 0 0 0 0"
+        Option "SecondarySoftButtonAreas" "58% 0 0 8% 42% 58% 0 8%"
 EndSection
 
 # This option disables software buttons on Apple touchpads.
@@ -64,5 +65,5 @@ Section "InputClass"
         Identifier "Lenovo TrackPoint top software buttons"
         MatchDriver "synaptics"
         MatchTag "touchpad_softbutton_top"
-        Option "SecondarySoftButtonAreas" "58% 0 0 8% 42% 58% 0 8%"
+        Option "HasSecondarySoftButtons" "on"
 EndSection
diff --git a/70-touchpad-quirks.rules b/70-touchpad-quirks.rules
index 4eea99b..0485ce2 100644
--- a/70-touchpad-quirks.rules
+++ b/70-touchpad-quirks.rules
@@ -19,6 +19,7 @@ ATTR{[dmi/id]product_version}=="ThinkPad L440*", ENV{ID_INPUT.tags}="touchpad_so
 ATTR{[dmi/id]product_version}=="ThinkPad T440*", ENV{ID_INPUT.tags}="touchpad_softbutton_top"
 ATTR{[dmi/id]product_version}=="ThinkPad L540*", ENV{ID_INPUT.tags}="touchpad_softbutton_top"
 ATTR{[dmi/id]product_version}=="ThinkPad T540*", ENV{ID_INPUT.tags}="touchpad_softbutton_top"
+ATTR{[dmi/id]product_version}=="ThinkPad W540*", ENV{ID_INPUT.tags}="touchpad_softbutton_top"
 ATTR{[dmi/id]product_version}=="ThinkPad Helix*" ENV{ID_INPUT.tags}="touchpad_softbutton_top"
 ATTR{[dmi/id]product_version}=="ThinkPad S1 Yoga", ENV{ID_INPUT.tags}="touchpad_softbutton_top"
 ATTR{[dmi/id]product_version}=="ThinkPad X1 Carbon 2nd*", ENV{ID_INPUT.tags}="touchpad_softbutton_top"
diff --git a/xorg-x11-drv-synaptics.spec b/xorg-x11-drv-synaptics.spec
index f895ded..9f80714 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.0
-Release:        1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
+Release:        2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
 URL:            http://www.x.org
 License:        MIT
 Group:          User Interface/X Hardware Support
@@ -128,6 +128,12 @@ Development files for the Synaptics TouchPad for X.Org.
 
 
 %changelog
+* Wed May 14 2014 Hans de Goede <hdegoede at redhat.com> - 1.8.0-2
+- Set Option "HasSecondarySoftButtons" "on" in 50-synaptics.conf for devices
+  with the touchpad_softbutton_top udev quirk, to keep topbuttons working on
+  kernels which don't set INPUT_PROP_TOPBUTTONPAD
+- Add W540 to 70-touchpad-quirks.rules as touchpad_softbutton_top (#1096436)
+
 * Tue May 13 2014 Peter Hutterer <peter.hutterer at redhat.com> 1.8.0-1
 - synaptics 1.8