From 0950ece4b75f2bd2cd5f8889e9ac7cb5816149bd Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri, 15 Apr 2011 16:03:43 +1000
Subject: [PATCH] Snapshot from git to fix French Canadian layouts (#694472)

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

diff --git a/.gitignore b/.gitignore
index d864c7d..68072a9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ xkeyboard-config-1.9.tar.bz2
 /xkeyboard-config-20110311.tar.bz2
 /xkeyboard-config-2.2.tar.bz2
 /xkeyboard-config-2.2.1.tar.bz2
+/xkeyboard-config-20110415.tar.bz2
diff --git a/commitid b/commitid
index d4d4b9b..572511e 100644
--- a/commitid
+++ b/commitid
@@ -1 +1 @@
-9333b2f3f0e3f1724b7a5c04b8ffc5eafb96fefa
+19a0026b5a8bd01cfc21bc8c7342e1c4f4567161
diff --git a/sources b/sources
index 0706397..a641cf8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1867472501d13594d5ca17e696cc09ca  xkeyboard-config-2.2.1.tar.bz2
+d92ea62b007c22adbedc4bd2cb769384  xkeyboard-config-20110415.tar.bz2
diff --git a/xkeyboard-config.spec b/xkeyboard-config.spec
index c931c82..45178c9 100644
--- a/xkeyboard-config.spec
+++ b/xkeyboard-config.spec
@@ -1,13 +1,13 @@
 # INFO: Package contains data-only, no binaries, so no debuginfo is needed
 %define debug_package %{nil}
 
-#global gitdate 20110311
-#global gitversion 9333b2f3
+%global gitdate 20110415
+%global gitversion 19a0026b5
 
 Summary: X Keyboard Extension configuration data
 Name: xkeyboard-config
 Version: 2.2.1
-Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{dist}
+Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{dist}
 License: MIT
 Group: User Interface/X
 URL: http://www.freedesktop.org/wiki/Software/XKeyboardConfig
@@ -105,6 +105,9 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/X11/xkb/compiled
 %{_datadir}/pkgconfig/xkeyboard-config.pc
 
 %changelog
+* Fri Apr 15 2011 Peter Hutterer <peter.hutterer@redhat.com> 2.2.1-2.20110415git19a0026b5
+- Snapshot from git to fix French Canadian layouts (#694472)
+
 * Wed Apr 06 2011 Peter Hutterer <peter.hutterer@redhat.com> 2.2.1-1
 - xkeyboard-config 2.2.1, 2.2 had a broken configure check
 - Add new BR and don't disable build/runtime deps checks