From f81be8f0261cce74799f946e99f23d57f8db7e17 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Dec 21 2017 00:51:21 +0000
Subject: Fix problem with typing some characters via VNC (LP#1738283)


Note: this is kinda a temporary fix, but I don't want to wait
for a 'real' fix from upstream as I want to build os-autoinst
for Rawhide and this bug prevents its test suite working right.

---

diff --git a/0001-Remove-problematic-evdev-86-key-from-en-us-keymap.patch b/0001-Remove-problematic-evdev-86-key-from-en-us-keymap.patch
new file mode 100644
index 0000000..837be82
--- /dev/null
+++ b/0001-Remove-problematic-evdev-86-key-from-en-us-keymap.patch
@@ -0,0 +1,32 @@
+From 2c25ad161d7714f15b1951c69c50844ea81f4186 Mon Sep 17 00:00:00 2001
+From: Adam Williamson <awilliam@redhat.com>
+Date: Wed, 20 Dec 2017 15:43:07 -0800
+Subject: [PATCH] Remove problematic 'evdev 86' key from en-us keymap
+
+This causes LP#1738283. Gerd will have to come up with a better
+fix, but just hacking out the problematic key definition should
+work for now.
+---
+ pc-bios/keymaps/en-us | 6 ------
+ 1 file changed, 6 deletions(-)
+
+diff --git a/pc-bios/keymaps/en-us b/pc-bios/keymaps/en-us
+index a70e03adc0..e518a9dc35 100644
+--- a/pc-bios/keymaps/en-us
++++ b/pc-bios/keymaps/en-us
+@@ -343,12 +343,6 @@ KP_Decimal 0x53 numlock
+ 
+ # evdev 85 (0x55): no evdev -> QKeyCode mapping (xkb keysym NoSymbol)
+ 
+-# evdev 86 (0x56), QKeyCode "less", number 0x56
+-less 0x56
+-greater 0x56 shift
+-bar 0x56 altgr
+-brokenbar 0x56 shift altgr
+-
+ # evdev 87 (0x57), QKeyCode "f11", number 0x57
+ F11 0x57
+ 
+-- 
+2.15.1
+
diff --git a/qemu.spec b/qemu.spec
index b2f103a..e786e0e 100644
--- a/qemu.spec
+++ b/qemu.spec
@@ -107,7 +107,7 @@ Requires: %{name}-block-ssh = %{epoch}:%{version}-%{release}
 Summary: QEMU is a FAST! processor emulator
 Name: qemu
 Version: 2.11.0
-Release: 2%{?rcrel}%{?dist}
+Release: 3%{?rcrel}%{?dist}
 Epoch: 2
 License: GPLv2+ and LGPLv2+ and BSD
 URL: http://www.qemu.org/
@@ -145,6 +145,9 @@ Source22: 95-kvm-ppc64-memlock.conf
 # fix compilation on newer glibc
 Patch0001: 0001-memfd-fix-configure-test.patch
 
+# hacky fix for https://bugs.launchpad.net/qemu/+bug/1738283
+Patch0002: 0001-Remove-problematic-evdev-86-key-from-en-us-keymap.patch
+
 # documentation deps
 BuildRequires: texinfo
 # For /usr/bin/pod2man
@@ -1976,6 +1979,9 @@ getent passwd qemu >/dev/null || \
 
 
 %changelog
+* Wed Dec 20 2017 Adam Williamson <awilliam@redhat.com> - 2:2.11.0-3
+- Fix problem with typing some characters via VNC (LP#1738283)
+
 * Wed Dec 20 2017 Cole Robinson <crobinso@redhat.com> - 2:2.11.0-2
 - Rebuild for xen 4.10