Revert two high keycode mappings, xkbcomp fails to parse those.

(#1587998)

0001-Revert-Map-evdev-keycode-KEY_KEYBOARD-to-XF86Keyboar.patch

@@ -0,0 +1,39 @@
+From b8b0550a6bfb5fdbd90f6d50e4707f5fd50b6ba3 Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Wed, 6 Jun 2018 12:59:57 +1000
+Subject: [PATCH xkeyboard-config 1/2] Revert "Map evdev keycode KEY_KEYBOARD
+ to XF86Keyboard"
+
+This reverts commit d0e5e63cf59be444bec0e5b11838a9abce45226d.
+---
+ keycodes/evdev | 1 -
+ symbols/inet   | 1 -
+ 2 files changed, 2 deletions(-)
+
+diff --git a/keycodes/evdev b/keycodes/evdev
+index 90b8278..f2630ff 100644
+--- a/keycodes/evdev
++++ b/keycodes/evdev
+@@ -285,7 +285,6 @@ default xkb_keycodes "evdev" {
+ 	<I255> = 255;	// #define KEY_RFKILL              247
+ 
+ 	<I372> = 372;   // #define KEY_FAVORITES           364
+-	<I374> = 374;   // #define KEY_KEYBOARD            366
+ 
+ 	// Fake keycodes for virtual keys
+ 	<LVL3> =   92;
+diff --git a/symbols/inet b/symbols/inet
+index bc4aaa3..5176e52 100644
+--- a/symbols/inet
++++ b/symbols/inet
+@@ -219,7 +219,6 @@ xkb_symbols "evdev" {
+     key <I255>   {      [ XF86RFKill            ]       }; // KEY_RFKILL
+ 
+     key <I372>  {       [ XF86Favorites          ]       };
+-    key <I374>  {       [ XF86Keyboard           ]       };
+ 
+     key <FK13>   {      [ XF86Tools         ]       };
+     key <FK14>   {      [ XF86Launch5       ]       };
+-- 
+2.14.4
+

0002-Revert-Map-evdev-keycode-KEY_FAVORITES-to-XF86Favori.patch

@@ -0,0 +1,41 @@
+From f464bbb2031fa0473d902b58abde7dc3519185d6 Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Wed, 6 Jun 2018 13:00:02 +1000
+Subject: [PATCH xkeyboard-config 2/2] Revert "Map evdev keycode KEY_FAVORITES
+ to XF86Favorites"
+
+This reverts commit e6103610a2ddae633e2715c9f1da86e79b5256dd.
+---
+ keycodes/evdev | 2 --
+ symbols/inet   | 2 --
+ 2 files changed, 4 deletions(-)
+
+diff --git a/keycodes/evdev b/keycodes/evdev
+index f2630ff..51a6e26 100644
+--- a/keycodes/evdev
++++ b/keycodes/evdev
+@@ -284,8 +284,6 @@ default xkb_keycodes "evdev" {
+ 	<I254> = 254;	// #define KEY_WWAN                246
+ 	<I255> = 255;	// #define KEY_RFKILL              247
+ 
+-	<I372> = 372;   // #define KEY_FAVORITES           364
+-
+ 	// Fake keycodes for virtual keys
+ 	<LVL3> =   92;
+ 	<MDSW> =   203;
+diff --git a/symbols/inet b/symbols/inet
+index 5176e52..2934b65 100644
+--- a/symbols/inet
++++ b/symbols/inet
+@@ -218,8 +218,6 @@ xkb_symbols "evdev" {
+     key <I254>   {      [ XF86WWAN              ]       }; // KEY_WWAN
+     key <I255>   {      [ XF86RFKill            ]       }; // KEY_RFKILL
+ 
+-    key <I372>  {       [ XF86Favorites          ]       };
+-
+     key <FK13>   {      [ XF86Tools         ]       };
+     key <FK14>   {      [ XF86Launch5       ]       };
+     key <FK15>   {      [ XF86Launch6       ]       };
+-- 
+2.14.4
+

xkeyboard-config.spec

@@ -7,7 +7,7 @@
 Summary:    X Keyboard Extension configuration data
 Name:       xkeyboard-config
 Version:    2.24
-Release:    1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
+Release:    2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
 License:    MIT
 URL:        http://www.freedesktop.org/wiki/Software/XKeyboardConfig
 
@@ -19,6 +19,12 @@ Source2:    commitid
 Source0:    http://xorg.freedesktop.org/archive/individual/data/%{name}/%{name}-%{version}.tar.bz2
 %endif
 
+# xkbcomp 1.4.1 fails to parse those because of maximum=374. See the patch
+# there, meanwhile revert them here until xorg-x11-xkb-utils-7.7-25 has been
+# in stable for a while
+Patch01:    0001-Revert-Map-evdev-keycode-KEY_KEYBOARD-to-XF86Keyboar.patch
+Patch02:    0002-Revert-Map-evdev-keycode-KEY_FAVORITES-to-XF86Favori.patch
+
 BuildArch:  noarch
 
 BuildRequires:  gettext
@@ -88,6 +94,10 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/X11/xkb/compiled
 %{_datadir}/pkgconfig/xkeyboard-config.pc
 
 %changelog
+* Thu Jun 07 2018 Peter Hutterer <peter.hutterer@redhat.com> 2.24-2
+- Revert two high keycode mappings, xkbcomp fails to parse those.
+  (#1587998)
+
 * Tue Jun 05 2018 Peter Hutterer <peter.hutterer@redhat.com> 2.24-1
 - xkeyboard-config 2.24