[xkeyboard-config] xkeyboard-config 2.9

[Peter Hutterer]

commit bba9c58fa03bc15e9245df93993052e09ecc99f8
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Thu May 30 14:59:17 2013 +1000

    xkeyboard-config 2.9

 .gitignore                                         |    1 +
 ...i-layouts-have-English-language-assigned-.patch |   36 ---
 0001-Fixing-ISO-codes.patch                        |   56 -----
 0001-Fixing-wrong-iso639-3-codes.patch             |   35 ---
 0001-fr-fra-ISO-639.patch                          |   25 --
 0001-rules-fix-iso639-code-for-irish.patch         |   31 ---
 olpc-ae00.patch                                    |   27 --
 olpc-mechanical-keyboard.patch                     |  258 --------------------
 sources                                            |    2 +-
 xkeyboard-config.spec                              |   16 +-
 10 files changed, 7 insertions(+), 480 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index cae5016..6299c3a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@ xkeyboard-config-1.9.tar.bz2
 /xkeyboard-config-2.6.tar.bz2
 /xkeyboard-config-2.7.tar.bz2
 /xkeyboard-config-2.8.tar.bz2
+/xkeyboard-config-2.9.tar.bz2
diff --git a/sources b/sources
index 5aff1c5..29ca9ee 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e66d567d85a954d589c5723fb0e1f3dd  xkeyboard-config-2.8.tar.bz2
+9b1280d8ba40274a0f1567c94fca7501  xkeyboard-config-2.9.tar.bz2
diff --git a/xkeyboard-config.spec b/xkeyboard-config.spec
index 6776a18..d8b3f5d 100644
--- a/xkeyboard-config.spec
+++ b/xkeyboard-config.spec
@@ -6,8 +6,8 @@
 
 Summary: X Keyboard Extension configuration data
 Name: xkeyboard-config
-Version: 2.8
-Release: 3%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
+Version: 2.9
+Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
 License: MIT
 Group: User Interface/X
 URL: http://www.freedesktop.org/wiki/Software/XKeyboardConfig
@@ -19,15 +19,6 @@ Source2:    commitid
 Source0: http://xorg.freedesktop.org/archive/individual/data/xkeyboard-config/%{name}-%{version}.tar.bz2
 %endif
 
-Patch01: 0001-English-Mali-layouts-have-English-language-assigned-.patch
-Patch02: 0001-Fixing-ISO-codes.patch
-Patch03: 0001-Fixing-wrong-iso639-3-codes.patch
-Patch04: 0001-fr-fra-ISO-639.patch
-Patch05: 0001-rules-fix-iso639-code-for-irish.patch
-# Fix OLPC Spanish mechanical keyboard http://dev.laptop.org/ticket/12645
-Patch06: olpc-mechanical-keyboard.patch
-Patch07: olpc-ae00.patch
-
 BuildArch: noarch
 
 BuildRequires: pkgconfig
@@ -118,6 +109,9 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/X11/xkb/compiled
 %{_datadir}/pkgconfig/xkeyboard-config.pc
 
 %changelog
+* Thu May 30 2013 Peter Hutterer <peter.hutterer at redhat.com> 2.9-1
+- xkeyboard-config 2.9
+
 * Wed May 15 2013 Daniel Drake <dsd at laptop.org> 2.8-3
 - Add upstream patches for OLPC mechanical keyboard support