From 919692e042511990c0993e1949b22555e9ad1838 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon, 4 Apr 2011 11:42:46 +1000
Subject: [PATCH] xkeyboard-config 2.2 reinstate the git bits removed in
 previous commit

---
 .gitignore            |  1 +
 sources               |  2 +-
 xkeyboard-config.spec | 10 +++++++---
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index f0f8fa9..96da850 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ xkeyboard-config-1.9.tar.bz2
 /xkeyboard-config-2.0.tar.bz2
 /xkeyboard-config-2.1.tar.bz2
 /xkeyboard-config-20110311.tar.bz2
+/xkeyboard-config-2.2.tar.bz2
diff --git a/sources b/sources
index 5b89e66..944cc64 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-04d61814e9499b899bce939fe67888d8  xkeyboard-config-20110311.tar.bz2
+06e37ed48dce3d979d9075d1aab29f87  xkeyboard-config-2.2.tar.bz2
diff --git a/xkeyboard-config.spec b/xkeyboard-config.spec
index ecf2c2f..31df84f 100644
--- a/xkeyboard-config.spec
+++ b/xkeyboard-config.spec
@@ -1,12 +1,12 @@
 # INFO: Package contains data-only, no binaries, so no debuginfo is needed
 %define debug_package %{nil}
 
-%global gitdate 20110311
-%global gitversion 9333b2f3
+#global gitdate 20110311
+#global gitversion 9333b2f3
 
 Summary: X Keyboard Extension configuration data
 Name: xkeyboard-config
-Version: 2.1.99
+Version: 2.2
 Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{dist}
 License: MIT
 Group: User Interface/X
@@ -105,6 +105,10 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/X11/xkb/compiled
 %{_datadir}/pkgconfig/xkeyboard-config.pc
 
 %changelog
+* Mon Apr 04 2011 Peter Hutterer <peter.hutterer@redhat.com> 2.2-1
+- xkeyboard-config 2.2
+- reinstate the git bits removed in previous commit
+
 * Fri Mar 25 2011 Matthias Clasen <mclasen@redhat.com> - 2.1.99-2
 - Update to 2.1.99 release