[xkeyboard-config/f18] Fix Mali layout previously mapped to in(mal) (#647433)

[Peter Hutterer]

commit 68b70043d3a38a4a4f830c69922fe6b33bf35f9c
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Wed Jan 2 11:05:30 2013 +1000

    Fix Mali layout previously mapped to in(mal) (#647433)

 0001-rules-remove-ml-in-mal-mapping.patch |   37 +++++++++++++++++++++++++++++
 xkeyboard-config.spec                     |    7 ++++-
 2 files changed, 43 insertions(+), 1 deletions(-)
---
diff --git a/0001-rules-remove-ml-in-mal-mapping.patch b/0001-rules-remove-ml-in-mal-mapping.patch
new file mode 100644
index 0000000..929b065
--- /dev/null
+++ b/0001-rules-remove-ml-in-mal-mapping.patch
@@ -0,0 +1,37 @@
+From 05bed913327ffd5ad1e830699a238bca226ee31c Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer at who-t.net>
+Date: Wed, 2 Jan 2013 10:50:57 +1000
+Subject: [PATCH] =?UTF-8?q?rules:=20remove=20ml=20=E2=86=92=20in(mal)=20ma?=
+ =?UTF-8?q?pping?=
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+ml is Mali, the country.
+in(mal) is Malayalam, the language
+
+Likely introduced in 0a5705d83d3f27892543e809b078644a2dba3911, but went
+unnoticed so far.
+
+https://bugzilla.redhat.com/show_bug.cgi?id=647433
+
+Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
+---
+ rules/compat/layoutsMapping.lst | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/rules/compat/layoutsMapping.lst b/rules/compat/layoutsMapping.lst
+index cecda6d..a1a0218 100644
+--- a/rules/compat/layoutsMapping.lst
++++ b/rules/compat/layoutsMapping.lst
+@@ -14,7 +14,6 @@ iu	ca(ike)
+ lo	la
+ kan	in(kan)
+ mi	mao
+-ml	in(mal)
+ ogham	ie(ogam)
+ ori	ie(ori)
+ sapmi	no(smi)
+-- 
+1.8.0.2
+
diff --git a/xkeyboard-config.spec b/xkeyboard-config.spec
index 4601ad8..deef099 100644
--- a/xkeyboard-config.spec
+++ b/xkeyboard-config.spec
@@ -7,7 +7,7 @@
 Summary: X Keyboard Extension configuration data
 Name: xkeyboard-config
 Version: 2.6
-Release: 5%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
+Release: 6%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
 License: MIT
 Group: User Interface/X
 URL: http://www.freedesktop.org/wiki/Software/XKeyboardConfig
@@ -21,6 +21,8 @@ Source0: http://xorg.freedesktop.org/archive/individual/data/xkeyboard-config/%{
 
 # Bug 826220 - Tilda is now a dead key (for accented chars)
 Patch01: 0001-Reverting-broken-fix-for-is-keyboard.patch
+# Bug 647433 - Mali keyboard layout is wrong (Malayalam layout is given)
+Patch02: 0001-rules-remove-ml-in-mal-mapping.patch
 
 BuildArch: noarch
 
@@ -112,6 +114,9 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/X11/xkb/compiled
 %{_datadir}/pkgconfig/xkeyboard-config.pc
 
 %changelog
+* Wed Jan 02 2013 Peter Hutterer <peter.hutterer at redhat.com> 2.6-6
+- Fix Mali layout previously mapped to in(mal) (#647433)
+
 * Wed Nov 14 2012 Peter Hutterer <peter.hutterer at redhat.com> - 2.6-5
 - Rebuild with fixed xkbcomp, re-create the right directory listing (not
   that anyone actually uses it)