[udev/f15] Update OLPC XO keymap

[Daniel Drake]

commit 9dc3a4b857355d2c8cb841586982189ed6ee6d81
Author: Daniel Drake <dsd at laptop.org>
Date:   Mon Aug 29 09:10:39 2011 +0100

    Update OLPC XO keymap

 udev-olpc-keymap-update.patch |   65 +++++++++++++++++++++++++++++++++++++++++
 udev.spec                     |    8 ++++-
 2 files changed, 72 insertions(+), 1 deletions(-)
---
diff --git a/udev-olpc-keymap-update.patch b/udev-olpc-keymap-update.patch
new file mode 100644
index 0000000..f1bbecf
--- /dev/null
+++ b/udev-olpc-keymap-update.patch
@@ -0,0 +1,65 @@
+From 00fc377e7a6b1997db346c8de51cbf05cad48376 Mon Sep 17 00:00:00 2001
+From: Paul Fox <pgf at laptop.org>
+Date: Mon, 22 Aug 2011 06:39:06 +0200
+Subject: [PATCH] keymap: update the OLPC keymap for correct function key
+ behavior
+
+New mappings were needed when the mechanical keyboard was
+introduced, and GNOME was made a peer to the sugar desktop.
+see http://lists.laptop.org/pipermail/devel/2010-July/029384.html
+---
+ extras/keymap/keymaps/olpc-xo |   38 ++++++++++++++++++++++++++------------
+ 1 files changed, 26 insertions(+), 12 deletions(-)
+
+diff --git a/extras/keymap/keymaps/olpc-xo b/extras/keymap/keymaps/olpc-xo
+index 7fe0662..34434a1 100644
+--- a/extras/keymap/keymaps/olpc-xo
++++ b/extras/keymap/keymaps/olpc-xo
+@@ -2,18 +2,32 @@
+ 0x81 fn_esc
+ 0xF9 camera
+ 0xF8 sound # Fn-CAMERA = Mic
+-0xBB fn_f1
+-0xBC fn_f2
+-0xBD fn_f3
+-0xBE fn_f4
+-0xBF fn_f5
+-0xC0 fn_f6
+-0xC1 fn_f7
+-0xC2 fn_f8
+-0xC3 fn_f9
+-0xC4 fn_f10
+-0xD7 fn_f11
+-0xD8 fn_f12
++
++
++# Function key mappings, as per
++#    http://dev.laptop.org/ticket/10213#comment:20
++#
++# Unmodified F1-F8 produce F1-F8, so no remap necessary.
++# Unmodified F9-F12 control brightness and volume.
++0x43 brightnessdown
++0x44 brightnessup
++0x57 volumedown
++0x58 volumeup
++
++# fn-modified fkeys all produce the unmodified version of the key.
++0xBB f1
++0xBC f2
++0xBD f3
++0xBE f4
++0xBF f5
++0xC0 f6
++0xC1 f7
++0xC2 f8
++0xC3 f9
++0xC4 f10
++0xD7 f11
++0xD8 f12
++
+ 
+ # Using F13-F21 for the .5 F keys right now.
+ 0xF7 f13
+-- 
+1.7.4.4
+
diff --git a/udev.spec b/udev.spec
index 6b402b4..0aec890 100644
--- a/udev.spec
+++ b/udev.spec
@@ -7,7 +7,7 @@
 Summary: A rule-based device node and kernel event manager
 Name: udev
 Version: 167
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Provides: udev-persistent = %{version}-%{release}
@@ -26,6 +26,8 @@ Patch8: 0008-keymap-Support-Dell-Latitude-XT2-tablet-mode-navigat.patch
 Patch9: 0009-selinux-do-not-label-files-in-runtime-dir.patch
 Patch10: 0010-selinux-firmware-do-not-label-files-in-runtime-dir.patch
 
+Patch1004: udev-olpc-keymap-update.patch
+
 
 ExclusiveOS: Linux
 URL: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html
@@ -130,6 +132,7 @@ glib-based applications using libudev functionality.
 %patch8 -p1 -b .git8
 %patch9 -p1 -b .git9
 %patch10 -p1 -b .git10
+%patch1004 -p1
 
 %build
 # prevent man pages from re-building (xmlto)
@@ -377,6 +380,9 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0644,root,root) %{_libdir}/pkgconfig/gudev-1.0*
 
 %changelog
+* Mon Aug 29 2011 Daniel Drake <dsd at laptop.org> 167-5
+- Update OLPC XO keymap
+
 * Mon Apr 11 2011 Harald Hoyer <harald at redhat.com> 167-4
 - more selinux fixes