[xkeyboard-config] - xkeyboard-config 2.1

[Peter Hutterer]

commit 75f542475bd1b285774891baa933514f9b90059c
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Thu Jan 27 16:17:55 2011 +1000

    - xkeyboard-config 2.1

 .gitignore                                   |    1 +
 0001-Clean-up-touchpad-key-definitions.patch |   28 --------------------------
 sources                                      |    2 +-
 xkeyboard-config.spec                        |   10 ++++----
 4 files changed, 7 insertions(+), 34 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 13b08d0..e76b75c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 xkeyboard-config-1.8.tar.bz2
 xkeyboard-config-1.9.tar.bz2
 /xkeyboard-config-2.0.tar.bz2
+/xkeyboard-config-2.1.tar.bz2
diff --git a/sources b/sources
index 91e66bf..985c01d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-06a8c600d086988cc98ea186d39d552e  xkeyboard-config-2.0.tar.bz2
+57ecc78bacd8ecc398d8ed6588f4d04b  xkeyboard-config-2.1.tar.bz2
diff --git a/xkeyboard-config.spec b/xkeyboard-config.spec
index 2334c5b..f9fa649 100644
--- a/xkeyboard-config.spec
+++ b/xkeyboard-config.spec
@@ -3,8 +3,8 @@
 
 Summary: X Keyboard Extension configuration data
 Name: xkeyboard-config
-Version: 2.0
-Release: 2%{?dist}
+Version: 2.1
+Release: 1%{?dist}
 License: MIT
 Group: User Interface/X
 URL: http://www.freedesktop.org/wiki/Software/XKeyboardConfig
@@ -20,8 +20,6 @@ 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 
@@ -38,7 +36,6 @@ Requires: pkgconfig
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch0 -p1 -b .touchpad
 
 git init-db
 if [ -z "$GIT_COMMITTER_NAME" ]; then
@@ -87,6 +84,9 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/X11/xkb/compiled
 %{_datadir}/pkgconfig/xkeyboard-config.pc
 
 %changelog
+* Thu Jan 27 2011 Peter Hutterer <peter.hutterer at redhat.com> 2.1-1
+- xkeyboard-config 2.1
+
 * Thu Nov 25 2010 Bastien Nocera <bnocera at redhat.com> 2.0-2
 - Use new touchpad toggle keysyms