From 6adac9bfb9fbf014fe7a9c120d0a53d715fd41dd Mon Sep 17 00:00:00 2001
From: Peter Hutterer <whot@fedoraproject.org>
Date: Mon, 29 Sep 2008 00:10:40 +0000
Subject: [PATCH] - xkeyboard-config-1.3-AC11-mapping-is.patch: fix AC11
 mapping for     icelandic keyboard layout (#241564)

---
 xkeyboard-config-1.3-AC11-mapping-is.patch | 13 +++++++++++++
 xkeyboard-config.spec                      |  9 ++++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 xkeyboard-config-1.3-AC11-mapping-is.patch

diff --git a/xkeyboard-config-1.3-AC11-mapping-is.patch b/xkeyboard-config-1.3-AC11-mapping-is.patch
new file mode 100644
index 0000000..a4a72e2
--- /dev/null
+++ b/xkeyboard-config-1.3-AC11-mapping-is.patch
@@ -0,0 +1,13 @@
+diff --git a/symbols/is b/symbols/is
+index ce03b3b..d68ae95 100644
+--- a/symbols/is
++++ b/symbols/is
+@@ -22,7 +22,7 @@ xkb_symbols "basic" {
+     key <AD12>	{ [apostrophe,   question,   asciitilde,  dead_macron ]	};
+ 
+     key <AC10>	{ [        ae,         AE,  asciicircum, dead_doubleacute ] };
+-    key <AC11>	{ [dead_acute, Adiaeresis, dead_circumflex, dead_caron]	};
++    key <AC11>	{ [dead_acute, dead_circumflex, dead_circumflex ] };
+     key <TLDE>	{ [    degree,  diaeresis,      notsign,      notsign ]	};
+ 
+     key <BKSL>	{ [      plus,   asterisk,        grave,   dead_breve ]	};
diff --git a/xkeyboard-config.spec b/xkeyboard-config.spec
index 5971d03..d91071c 100644
--- a/xkeyboard-config.spec
+++ b/xkeyboard-config.spec
@@ -4,7 +4,7 @@
 Summary: xkeyboard-config alternative xkb data files
 Name: xkeyboard-config
 Version: 1.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: MIT
 Group: User Interface/X
 URL: http://www.x.org
@@ -13,6 +13,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source0: http://xlibs.freedesktop.org/xkbdesc/%{name}-%{version}.tar.bz2
 Patch1: olpc-xkeyboard-config-kz-group.patch
 Patch2: usinet.patch
+# Bug 241564, FDO bug 17786 (resolved, fixed)
+Patch3: xkeyboard-config-1.3-AC11-mapping-is.patch
 
 BuildArch: noarch
 
@@ -43,6 +45,7 @@ xkeyboard-config alternative xkb data files
 %setup -q
 %patch1 -p1 -b .kzgroup
 %patch2 -p1 -b .usinet
+%patch3 -p1 -b .AC11-mapping-is
 
 %build
 %configure \
@@ -82,6 +85,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/X11/xkb/rules/xorg.xml
 
 %changelog
+* Mon Sep 29 2008 Peter Hutterer  <peter.hutterer@redhat.com> - 1.3-2
+- xkeyboard-config-1.3-AC11-mapping-is.patch: fix AC11 mapping for icelandic
+  keyboard layout (#241564)
+
 * Wed May 28 2008 Matthias Clasen  <mclasen@redhat.com> - 1.3-1
 - Update to 1.3