From 61ad1f41fd601d95488d23f7a7c476e30e49f926 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Dec 18 2018 18:35:22 +0000
Subject: Restore patch to drop phantom 86 key from en-us keymap (bz #1658676)


The exact bug this was initially added to workaround was fixed
in 2.12, so @crobinso dropped the patch. However, the phantom
key turns out to still cause problems in another case, so until
that is fixed, we need to put this back. See
https://bugzilla.redhat.com/show_bug.cgi?id=1658676 for full
details on the outstanding bug.

---

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 c125827..eef5b60 100644
--- a/qemu.spec
+++ b/qemu.spec
@@ -127,7 +127,7 @@ Requires: %{name}-ui-sdl = %{epoch}:%{version}-%{release}
 Summary: QEMU is a FAST! processor emulator
 Name: qemu
 Version: 3.1.0
-Release: 1%{?rcrel}%{?dist}
+Release: 2%{?rcrel}%{?dist}
 Epoch: 2
 License: GPLv2 and BSD and MIT and CC-BY
 URL: http://www.qemu.org/
@@ -151,6 +151,9 @@ Source20: kvm-x86.modprobe.conf
 # /etc/security/limits.d/95-kvm-ppc64-memlock.conf
 Source21: 95-kvm-ppc64-memlock.conf
 
+# Good ol' keymap 86 still messin with us
+Patch0: 0001-Remove-problematic-evdev-86-key-from-en-us-keymap.patch
+
 
 
 # documentation deps
@@ -1632,6 +1635,9 @@ getent passwd qemu >/dev/null || \
 
 
 %changelog
+* Tue Dec 18 2018 Adam Williamson <awilliam@redhat.com> - 2:3.1.0-1.1
+- Restore patch to drop phantom 86 key from en-us keymap (bz #1658676)
+
 * Tue Dec 11 2018 Cole Robinson <crobinso@redhat.com> - 2:3.1.0-1
 - Rebase to qemu-3.1.0 GA