[xorg-x11-server/f17] Add quirk for Evoluent Vertical Mouse 3, button mapping is quirky

[Peter Hutterer]

commit 64c27fc0b27a4c2b62eddedf9ac2ef6a79f8571b
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Fri Jan 25 16:39:20 2013 +1000

    Add quirk for Evoluent Vertical Mouse 3, button mapping is quirky
    
      (#612140)
    
    Conflicts:
    	xorg-x11-server.spec

 10-quirks.conf       |   16 ++++++++++++++++
 xorg-x11-server.spec |    6 +++++-
 2 files changed, 21 insertions(+), 1 deletions(-)
---
diff --git a/10-quirks.conf b/10-quirks.conf
index 82d3ec2..c850660 100644
--- a/10-quirks.conf
+++ b/10-quirks.conf
@@ -18,3 +18,19 @@ Section "InputClass"
         Option "IgnoreAbsoluteAxes" "off"
         Option "IgnoreRelativeAxes" "off"
 EndSection
+
+# https://bugzilla.redhat.com/show_bug.cgi?id=612140
+# please make Evoluent VerticalMouse 3 work out of the box
+# Button mapping on this mouse is quirky
+Section "InputClass"
+	Identifier "Evoluent VerticalMouse 3"
+        MatchProduct "Evoluent VerticalMouse 3"
+        # Sets following configuration:
+        # top button:    left
+        # middle button: middle
+        # bottom button: right
+        # wheel click:   middle
+        # thumb button:  8 (back)
+	Option "ButtonMapping" "1 2 2 0 0 0 0 3 8"
+EndSection
+
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 73ccc9f..9069884 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -48,7 +48,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.12.4
-Release:   4%{?gitdate:.%{gitdate}}%{dist}
+Release:   5%{?gitdate:.%{gitdate}}%{dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -591,6 +591,10 @@ rm -rf $RPM_BUILD_ROOT
 %{xserver_source_dir}
 
 %changelog
+* Thu Jan 31 2013 Peter Hutterer <peter.hutterer at redhat.com> 1.12.4-5
+- Add quirk for Evoluent Vertical Mouse 3, button mapping is quirky
+  (#612140)
+
 * Tue Jan 29 2013 Peter Hutterer <peter.hutterer at redhat.com> 1.12.4-4
 - Avoid memory corruption on too many touch listeners (#862829)