From 0cd998329426ab15a7f6c5ca9465f3198a29e7f6635dd611fa89dfe28f36a163 Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Mon, 10 Mar 2008 18:40:34 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/xkeyboard-config?expand=0&rev=15

---
 microsoftnek4k-keycodes.diff                  | 46 +++++++++++++++++++
 ...apping.diff => microsoftnek4k-symbols.diff | 11 +++++
 xkeyboard-config.changes                      |  5 ++
 xkeyboard-config.spec                         |  8 +++-
 4 files changed, 68 insertions(+), 2 deletions(-)
 create mode 100644 microsoftnek4k-keycodes.diff
 rename microsoftnek4k-mapping.diff => microsoftnek4k-symbols.diff (89%)

diff --git a/microsoftnek4k-keycodes.diff b/microsoftnek4k-keycodes.diff
new file mode 100644
index 0000000..5fac70d
--- /dev/null
+++ b/microsoftnek4k-keycodes.diff
@@ -0,0 +1,46 @@
+--- keycodes/nek4k.orig	2008-03-10 17:49:17.000000000 +0100
++++ keycodes/nek4k	2008-03-10 18:28:50.000000000 +0100
+@@ -2,10 +2,10 @@
+ 
+         <WEB>   =       180;
+         <FIND>  =       225;
+-        <MAIL>  =       223;
++        <MAIL>  =       163;
+ 
+-        <ZMUP>  =       191;
+-        <ZMDN>  =       192;
++        //<ZMUP>  =       191;
++        //<ZMDN>  =       192;
+ 
+         <PREV>  =       166;
+         <SUCC>  =       167;
+@@ -21,13 +21,13 @@
+ 
+         <CALC>  =       148;
+ 
+-alias   <BKMK>  =       <DOWN>;
++//alias   <BKMK>  =       <DOWN>;
+ 
+-        <ONE>   =       218;
+-        <TWO>   =       219;
+-        <THRE>  =       220;
+-        <FOUR>  =       221;
+-        <FIVE>  =       222;
++        <ONE>   =       192;
++        <TWO>   =       193;
++        <THRE>  =       194;
++        <FOUR>  =       195;
++        <FIVE>  =       196;
+ 
+         <HELP>  =       146;
+         <UNDO>  =       139;
+@@ -39,7 +39,7 @@
+         <REPL>  =       240;
+         <FWD>   =       241;
+         <SEND>  =       239;
+-        <SPLL>  =       193;
++        //<SPLL>  =       193;
+         <SAVE>  =       242;
+-alias   <PRNT>  =       <ONE>;
++//alias   <PRNT>  =       <ONE>;
+ };
diff --git a/microsoftnek4k-mapping.diff b/microsoftnek4k-symbols.diff
similarity index 89%
rename from microsoftnek4k-mapping.diff
rename to microsoftnek4k-symbols.diff
index 70ec6bd..c38073b 100644
--- a/microsoftnek4k-mapping.diff
+++ b/microsoftnek4k-symbols.diff
@@ -68,4 +68,15 @@
 +    key <SAVE>   {       [ XF86Save      ]       }; 
  };
  
+ // Oretec
+--- ../xkb.orig/symbols/inet	2008-03-10 18:40:39.000000000 +0100
++++ symbols/inet	2008-03-10 18:43:09.000000000 +0100
+@@ -1757,6 +1757,8 @@
+     key <SEND>   {       [ XF86Send      ]       }; 
+     key <SPLL>   {       [ XF86Spell     ]       }; 
+     key <SAVE>   {       [ XF86Save      ]       }; 
++    key <I164>   {       [ XF86Favorites ]       };
++    key <I218>   {       [ Print         ]       };
+ };
+ 
  // Oretec
diff --git a/xkeyboard-config.changes b/xkeyboard-config.changes
index c05d3de..9058daf 100644
--- a/xkeyboard-config.changes
+++ b/xkeyboard-config.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Mar 10 18:31:26 CET 2008 - sndirsch@suse.de
+
+- fixed keycodes of MS nek4k (bnc #366515)
+
 -------------------------------------------------------------------
 Mon Mar 10 16:55:20 CET 2008 - sndirsch@suse.de
 
diff --git a/xkeyboard-config.spec b/xkeyboard-config.spec
index 537b40d..ca18646 100644
--- a/xkeyboard-config.spec
+++ b/xkeyboard-config.spec
@@ -21,7 +21,7 @@ Provides:       xorg-x11:/etc/X11/xkb/symbols/us XFree86:/etc/X11/xkb/symbols/us
 PreReq:         /bin/ln /bin/rm
 AutoReqProv:    on
 Version:        1.2
-Release:        17
+Release:        18
 Summary:        The X Keyboard Extension
 Source:         %name-%version.tar.bz2
 Patch4:         xkeyboard-config.mainline-cvs.mac-es.patch
@@ -33,7 +33,8 @@ Patch103:       xkeyboard-config.powerbook-usb-iso-keyboard.patch
 Patch104:       xkeyboard-config.inet.patch
 Patch105:       lv.diff
 Patch106:       microsoftnek4k.diff
-Patch107:       microsoftnek4k-mapping.diff
+Patch107:       microsoftnek4k-symbols.diff
+Patch108:       microsoftnek4k-keycodes.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
 
@@ -65,6 +66,7 @@ Authors:
 %patch105
 %patch106
 %patch107
+%patch108
 
 %build
 %configure --with-xkb-rules-symlink=xfree86,xorg \
@@ -91,6 +93,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Mon Mar 10 2008 sndirsch@suse.de
+- fixed keycodes of MS nek4k (bnc #366515)
+* Mon Mar 10 2008 sndirsch@suse.de
 - more work on support for MS nek4k
 * Sun Mar 09 2008 sndirsch@suse.de
 - added support for 'Microsoft Natural Ergonomic Keyboard 4000'