rpms/xkeyboard-config/F-9 xkeyboard-config-1.2-AC11-mapping-is.patch, NONE, 1.1 xkeyboard-config.spec, 1.18, 1.19

[Peter Hutterer]

Author: whot

Update of /cvs/pkgs/rpms/xkeyboard-config/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6281

Modified Files:
	xkeyboard-config.spec 
Added Files:
	xkeyboard-config-1.2-AC11-mapping-is.patch 
Log Message:
* Mon Sep 29 2008 Peter Hutterer  <peter.hutterer at redhat.com> - 1.2-4
- xkeyboard-config-1.2-AC11-mapping-is.patch: fix AC11 mapping for icelandic
  keyboard layout (#241564)



xkeyboard-config-1.2-AC11-mapping-is.patch:

--- NEW FILE xkeyboard-config-1.2-AC11-mapping-is.patch ---
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 ]	};


Index: xkeyboard-config.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xkeyboard-config/F-9/xkeyboard-config.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- xkeyboard-config.spec	15 Apr 2008 02:50:37 -0000	1.18
+++ xkeyboard-config.spec	28 Sep 2008 23:49:23 -0000	1.19
@@ -4,7 +4,7 @@
 Summary: xkeyboard-config alternative xkb data files
 Name: xkeyboard-config
 Version: 1.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: MIT
 Group: User Interface/X
 URL: http://www.x.org
@@ -13,6 +13,8 @@
 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.2-AC11-mapping-is.patch
 
 BuildArch: noarch
 
@@ -43,6 +45,7 @@
 %setup -q
 %patch1 -p1 -b .kzgroup
 %patch2 -p1 -b .usinet
+%patch3 -p1 -b .AC11-mapping-is
 
 %build
 %configure \
@@ -82,6 +85,10 @@
 %{_datadir}/X11/xkb/rules/xorg.xml
 
 %changelog
+* Mon Sep 29 2008 Peter Hutterer  <peter.hutterer at redhat.com> - 1.2-4
+- xkeyboard-config-1.2-AC11-mapping-is.patch: fix AC11 mapping for icelandic
+  keyboard layout (#241564)
+
 * Mon Apr 14 2008 Matthias Clasen  <mclasen at redhat.com> - 1.2-3
 - Also add back and forward keys to pc105 (#441398)