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

---
 microsoftnek4k-mapping.diff | 71 +++++++++++++++++++++++++++++++++++++
 xkeyboard-config.changes    |  5 +++
 xkeyboard-config.spec       |  6 +++-
 3 files changed, 81 insertions(+), 1 deletion(-)
 create mode 100644 microsoftnek4k-mapping.diff

diff --git a/microsoftnek4k-mapping.diff b/microsoftnek4k-mapping.diff
new file mode 100644
index 0000000..70ec6bd
--- /dev/null
+++ b/microsoftnek4k-mapping.diff
@@ -0,0 +1,71 @@
+--- symbols/inet.old	2008-03-10 15:30:06.000000000 +0100
++++ symbols/inet	2008-03-10 16:41:05.000000000 +0100
+@@ -1726,37 +1726,37 @@
+ // Microsoft Natural Ergonomic Keyboard 4000
+ partial alphanumeric_keys
+ xkb_symbols "microsoftnek4k" {
+-    key <WEB>    {       [ XF86WWW ]       }; 
+-    key <FIND>   {       [ XF86Documents ]       }; 
+-    key <MAIL>   {       [ XF86Documents ]       }; 
+-    key <ZMUP>   {       [ XF86Documents ]       }; 
+-    key <ZMDN>   {       [ XF86Documents ]       }; 
+-    key <PREV>   {       [ XF86Documents ]       }; 
+-    key <SUCC>   {       [ XF86Documents ]       }; 
+-    key <EQUL>   {       [ XF86Documents ]       }; 
+-    key <PARO>   {       [ XF86Documents ]       }; 
+-    key <PARC>   {       [ XF86Documents ]       }; 
+-    key <MUTE>   {       [ XF86Documents ]       }; 
+-    key <VOLU>   {       [ XF86Documents ]       }; 
+-    key <VOLD>   {       [ XF86Documents ]       }; 
+-    key <PLAY>   {       [ XF86Documents ]       }; 
+-    key <CALC>   {       [ XF86Documents ]       }; 
+-    key <ONE>    {       [ XF86Documents ]       }; 
+-    key <TWO>    {       [ XF86Documents ]       }; 
+-    key <THRE>   {       [ XF86Documents ]       }; 
+-    key <FOUR>   {       [ XF86Documents ]       }; 
+-    key <FIVE>   {       [ XF86Documents ]       }; 
+-    key <HELP>   {       [ XF86Documents ]       }; 
+-    key <UNDO>   {       [ XF86Documents ]       }; 
+-    key <REDO>   {       [ XF86Documents ]       }; 
+-    key <NEW>    {       [ XF86Documents ]       }; 
+-    key <OPEN>   {       [ XF86Documents ]       }; 
+-    key <CLOS>   {       [ XF86Documents ]       }; 
+-    key <REPL>   {       [ XF86Documents ]       }; 
+-    key <FWD>    {       [ XF86Documents ]       }; 
+-    key <SEND>   {       [ XF86Documents ]       }; 
+-    key <SPLL>   {       [ XF86Documents ]       }; 
+-    key <SAVE>   {       [ XF86Documents ]       }; 
++    key <WEB>    {       [ XF86WWW       ]       }; 
++    key <FIND>   {       [ Find          ]       }; 
++    key <MAIL>   {       [ XF86Mail      ]       }; 
++    key <ZMUP>   {       [ XF86ZoomIn    ]       }; 
++    key <ZMDN>   {       [ XF86ZoomOut   ]       }; 
++    key <PREV>   {       [ XF86AudioPrev ]       }; 
++    key <SUCC>   {       [ XF86AudioNext ]       }; 
++    key <EQUL>   {       [ equal         ]       }; 
++    key <PARO>   {       [ parenleft     ]       }; 
++    key <PARC>   {       [ parenright    ]       }; 
++    key <MUTE>   {       [ XF86AudioMute ]       }; 
++    key <VOLU>   {       [ XF86AudioRaiseVolume ]}; 
++    key <VOLD>   {       [ XF86AudioLowerVolume ]}; 
++    key <PLAY>   {       [ XF86AudioPlay ]       }; 
++    key <CALC>   {       [ XF86Calculator]       }; 
++    key <ONE>    {       [ XF86Launch1   ]       }; 
++    key <TWO>    {       [ XF86Launch2   ]       }; 
++    key <THRE>   {       [ XF86Launch3   ]       }; 
++    key <FOUR>   {       [ XF86Launch4   ]       }; 
++    key <FIVE>   {       [ XF86Launch5   ]       }; 
++    key <HELP>   {       [ Help          ]       }; 
++    key <UNDO>   {       [ Undo          ]       }; 
++    key <REDO>   {       [ Redo          ]       }; 
++    key <NEW>    {       [ XF86New       ]       }; 
++    key <OPEN>   {       [ XF86Open      ]       }; 
++    key <CLOS>   {       [ XF86Close     ]       }; 
++    key <REPL>   {       [ XF86Reply     ]       }; 
++    key <FWD>    {       [ XF86MailForward ]     }; 
++    key <SEND>   {       [ XF86Send      ]       }; 
++    key <SPLL>   {       [ XF86Spell     ]       }; 
++    key <SAVE>   {       [ XF86Save      ]       }; 
+ };
+ 
+ // Oretec
diff --git a/xkeyboard-config.changes b/xkeyboard-config.changes
index ad3d4f3..c05d3de 100644
--- a/xkeyboard-config.changes
+++ b/xkeyboard-config.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Mar 10 16:55:20 CET 2008 - sndirsch@suse.de
+
+- more work on support for MS nek4k
+
 -------------------------------------------------------------------
 Sat Mar  8 23:51:33 CET 2008 - sndirsch@suse.de
 
diff --git a/xkeyboard-config.spec b/xkeyboard-config.spec
index 3aff723..537b40d 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:        16
+Release:        17
 Summary:        The X Keyboard Extension
 Source:         %name-%version.tar.bz2
 Patch4:         xkeyboard-config.mainline-cvs.mac-es.patch
@@ -33,6 +33,7 @@ Patch103:       xkeyboard-config.powerbook-usb-iso-keyboard.patch
 Patch104:       xkeyboard-config.inet.patch
 Patch105:       lv.diff
 Patch106:       microsoftnek4k.diff
+Patch107:       microsoftnek4k-mapping.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
 
@@ -63,6 +64,7 @@ Authors:
 %patch104
 %patch105
 %patch106
+%patch107
 
 %build
 %configure --with-xkb-rules-symlink=xfree86,xorg \
@@ -88,6 +90,8 @@ rm -rf $RPM_BUILD_ROOT
 /usr/share/X11/xkb/
 
 %changelog
+* 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'
   (bnc #366515)