From d08c5e162e60a513d83faff13d6b1baff3a8d70f Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@hadess.net>
Date: Thu, 25 Nov 2010 17:06:02 +0000
Subject: [PATCH] - Use new touchpad toggle keysyms

---
 0001-Clean-up-touchpad-key-definitions.patch | 28 ++++++++++++++++++++
 xkeyboard-config.spec                        |  8 +++++-
 2 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 0001-Clean-up-touchpad-key-definitions.patch

diff --git a/0001-Clean-up-touchpad-key-definitions.patch b/0001-Clean-up-touchpad-key-definitions.patch
new file mode 100644
index 0000000..51305f6
--- /dev/null
+++ b/0001-Clean-up-touchpad-key-definitions.patch
@@ -0,0 +1,28 @@
+From fe6ee4319113ca4a720f90270eec5a8620b4cf4a Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Tue, 2 Nov 2010 18:32:15 +0000
+Subject: [PATCH] Clean up touchpad key definitions
+
+https://bugs.freedesktop.org/show_bug.cgi?id=31333
+---
+ symbols/inet |    4 +++-
+ 1 files changed, 3 insertions(+), 1 deletions(-)
+
+diff --git a/symbols/inet b/symbols/inet
+index 5de28b8..3f91252 100644
+--- a/symbols/inet
++++ b/symbols/inet
+@@ -120,7 +120,9 @@ xkb_symbols "evdev" {
+ 
+     key <HNGL>   {      [ Hangul                ]       };
+     key <HJCV>   {      [ Hangul_Hanja          ]       };
+-    key <FK22>   {      [ XF86TouchpadToggle    ]       };
++    key <FK21>   {      [ XF86TouchpadToggle    ]       };
++    key <FK22>   {      [ XF86TouchpadOn        ]       };
++    key <FK23>   {      [ XF86TouchpadOff       ]       };
+ 
+ //  key <I120>   {      [ ]       }; // KEY_MACRO 
+     key <I126>   {      [ plusminus             ]       };
+-- 
+1.7.3.2
+
diff --git a/xkeyboard-config.spec b/xkeyboard-config.spec
index fdbda7a..2334c5b 100644
--- a/xkeyboard-config.spec
+++ b/xkeyboard-config.spec
@@ -4,7 +4,7 @@
 Summary: X Keyboard Extension configuration data
 Name: xkeyboard-config
 Version: 2.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: MIT
 Group: User Interface/X
 URL: http://www.freedesktop.org/wiki/Software/XKeyboardConfig
@@ -20,6 +20,8 @@ BuildRequires: intltool
 BuildRequires: gettext
 BuildRequires: git-core
 
+Patch0: 0001-Clean-up-touchpad-key-definitions.patch
+
 %description
 This package contains configuration data used by the X Keyboard Extension 
 (XKB), which allows selection of keyboard layouts when using a graphical 
@@ -36,6 +38,7 @@ Requires: pkgconfig
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch0 -p1 -b .touchpad
 
 git init-db
 if [ -z "$GIT_COMMITTER_NAME" ]; then
@@ -84,6 +87,9 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/X11/xkb/compiled
 %{_datadir}/pkgconfig/xkeyboard-config.pc
 
 %changelog
+* Thu Nov 25 2010 Bastien Nocera <bnocera@redhat.com> 2.0-2
+- Use new touchpad toggle keysyms
+
 * Wed Sep 29 2010 Peter Hutterer <peter.hutterer@redhat.com> 2.0-1
 - xkeyboard-config 2.0