diff --git a/tp-menu.diff b/tp-menu.diff deleted file mode 100644 index e8a4ac9..0000000 --- a/tp-menu.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- symbols/pc.orig 2007-05-21 15:28:38.000000000 +0200 -+++ symbols/pc 2007-05-21 15:29:48.000000000 +0200 -@@ -42,6 +42,8 @@ - key { [ Super_R, Multi_key ] }; - - key { [ Menu ] }; -+ // Thinkpad T60 -+ key { [ Menu ] }; - - // begin modifier mappings - modifier_map Shift { Shift_L, Shift_R }; diff --git a/xkeyboard-config.br.abnt2_inet.patch b/xkeyboard-config.br.abnt2_inet.patch new file mode 100644 index 0000000..a91325d --- /dev/null +++ b/xkeyboard-config.br.abnt2_inet.patch @@ -0,0 +1,42 @@ +--- symbols/br.orig 2009-04-25 04:56:17.000000000 +0200 ++++ symbols/br 2009-04-25 04:56:19.000000000 +0200 +@@ -320,3 +320,8 @@ + key { [ gcircumflex, Gcircumflex, q, Q ] }; + + }; ++ ++partial alphanumeric_keys ++xkb_symbols "abnt2_inet" { ++ include "br(abnt2)" ++}; +diff -u -r rules.orig//base.m_g.part rules/base.m_g.part +--- rules.orig//base.m_g.part 2009-04-25 03:19:33.000000000 +0200 ++++ rules/base.m_g.part 2009-04-25 03:21:21.000000000 +0200 +@@ -8,6 +8,7 @@ + omnikey101 = northgate(omnikey101) + $pcmodels = pc(%m) + $pcgeometries = pc(%m) ++ abnt2_inet = pc(abnt2) + everex = everex(STEPnote) + thinkpad = thinkpad(intl) + thinkpad60 = thinkpad(60) +diff -u -r rules.orig//base.m_k.part rules/base.m_k.part +--- rules.orig//base.m_k.part 2009-04-25 03:19:33.000000000 +0200 ++++ rules/base.m_k.part 2009-04-25 03:20:23.000000000 +0200 +@@ -5,6 +5,7 @@ + sun6 = sun(type6_usb) + pc98 = xfree98(pc98) + abnt2 = xfree86(abnt2) ++ abnt2_inet = xfree86(abnt2) + jp106 = xfree86(jp106) + evdev = evdev + microsoftnek4k = evdev+nek4k(nek4k) +--- rules/base.m_s.part.orig 2009-04-25 13:21:27.000000000 +0200 ++++ rules/base.m_s.part 2009-04-25 13:23:47.000000000 +0200 +@@ -43,5 +43,6 @@ + thinkpadz60 = +inet(thinkpad60) + vsonku306 = +inet(microsoftprooem) + $inetkbds = +inet(%m) ++ abnt2_inet = +inet(microsoftpro) + $maclaptop = +inet(apple)+level3(enter_switch) + $macs = +inet(apple) diff --git a/xkeyboard-config.changes b/xkeyboard-config.changes index ba0256c..67484ef 100644 --- a/xkeyboard-config.changes +++ b/xkeyboard-config.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Sat Apr 25 16:37:27 CEST 2009 - sndirsch@suse.de + +- xkeyboard-config.jp.jp106_inet.patch + * new jp106_inet xkbmodel required for jp layout (bnc #497647) + +------------------------------------------------------------------- +Sat Apr 25 13:20:39 CEST 2009 - sndirsch@suse.de + +- xkeyboard-config.br.abnt2_inet.patch + * new abnt2_inet xkbmodel required for br layout (bnc #497647) + +------------------------------------------------------------------- +Thu Apr 9 02:32:00 CEST 2009 - sndirsch@suse.de + +- minor cleanup + ------------------------------------------------------------------- Mon Apr 6 15:32:55 CEST 2009 - eich@suse.de diff --git a/xkeyboard-config.jp.jp106_inet.patch b/xkeyboard-config.jp.jp106_inet.patch new file mode 100644 index 0000000..df7750f --- /dev/null +++ b/xkeyboard-config.jp.jp106_inet.patch @@ -0,0 +1,43 @@ +diff -u -r ../xkeyboard-config-1.3.orig//rules/base.m_g.part ./rules/base.m_g.part +--- ../xkeyboard-config-1.3.orig//rules/base.m_g.part 2009-04-25 16:26:53.000000000 +0200 ++++ ./rules/base.m_g.part 2009-04-25 16:30:58.000000000 +0200 +@@ -9,6 +9,7 @@ + $pcmodels = pc(%m) + $pcgeometries = pc(%m) + abnt2_inet = pc(abnt2) ++ jp106_inet = pc(jp106) + everex = everex(STEPnote) + thinkpad = thinkpad(intl) + thinkpad60 = thinkpad(60) +diff -u -r ../xkeyboard-config-1.3.orig//rules/base.m_k.part ./rules/base.m_k.part +--- ../xkeyboard-config-1.3.orig//rules/base.m_k.part 2009-04-25 16:26:53.000000000 +0200 ++++ ./rules/base.m_k.part 2009-04-25 16:33:07.000000000 +0200 +@@ -7,6 +7,7 @@ + abnt2 = xfree86(abnt2) + abnt2_inet = xfree86(abnt2) + jp106 = xfree86(jp106) ++ jp106_inet = xfree86(jp106) + evdev = evdev + microsoftnek4k = evdev+nek4k(nek4k) + olpc = evdev +diff -u -r ../xkeyboard-config-1.3.orig//symbols/jp ./symbols/jp +--- ../xkeyboard-config-1.3.orig//symbols/jp 2009-04-25 16:26:53.000000000 +0200 ++++ ./symbols/jp 2009-04-25 16:32:08.000000000 +0200 +@@ -211,3 +211,8 @@ + key { [ Escape ] }; + key { [ at, grave ] }; + }; ++ ++partial alphanumeric_keys ++xkb_symbols "jp106_inet" { ++ include "jp(106)" ++}; +--- rules/base.m_s.part.orig 2009-04-25 16:38:35.000000000 +0200 ++++ rules/base.m_s.part 2009-04-25 16:39:36.000000000 +0200 +@@ -44,5 +44,6 @@ + vsonku306 = +inet(microsoftprooem) + $inetkbds = +inet(%m) + abnt2_inet = +inet(microsoftpro) ++ jp106_inet = +inet(microsoftpro) + $maclaptop = +inet(apple)+level3(enter_switch) + $macs = +inet(apple) diff --git a/xkeyboard-config.spec b/xkeyboard-config.spec index df678f7..7bf7733 100644 --- a/xkeyboard-config.spec +++ b/xkeyboard-config.spec @@ -28,11 +28,10 @@ Provides: xorg-x11:/etc/X11/xkb/symbols/us XFree86:/etc/X11/xkb/symbols/us PreReq: /bin/ln /bin/rm AutoReqProv: on Version: 1.5 -Release: 2 +Release: 3 Summary: The X Keyboard Extension Source: %name-%version.tar.bz2 Patch4: xkeyboard-config.mainline-cvs.mac-es.patch -Patch9: tp-menu.diff Patch40: xkeyboard-config.macintosh.patch Patch100: p_suse.diff Patch101: ibm_space_saver.diff @@ -45,6 +44,8 @@ Patch110: MDSW-change-keycode.diff Patch112: ucw_suse.diff Patch113: xkeyboard-config.sr@latin.diff Patch114: cs.po.diff +Patch115: xkeyboard-config.br.abnt2_inet.patch +Patch116: xkeyboard-config.jp.jp106_inet.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -66,8 +67,6 @@ Authors: %prep %setup -q %patch4 -### wrong approach (Bug #302099) -#%patch9 %patch40 %patch100 %patch101 @@ -80,6 +79,8 @@ Authors: %patch112 -p1 %patch113 -p0 %patch114 -p0 +%patch115 -p0 +%patch116 -p0 mv po/sr@{Latn,latin}.po %build @@ -110,6 +111,14 @@ rm -rf $RPM_BUILD_ROOT /usr/share/X11/xkb/ %changelog +* Sat Apr 25 2009 sndirsch@suse.de +- xkeyboard-config.jp.jp106_inet.patch + * new jp106_inet xkbmodel required for jp layout (bnc #497647) +* Sat Apr 25 2009 sndirsch@suse.de +- xkeyboard-config.br.abnt2_inet.patch + * new abnt2_inet xkbmodel required for br layout (bnc #497647) +* Thu Apr 09 2009 sndirsch@suse.de +- minor cleanup * Mon Apr 06 2009 eich@suse.de - Update patches to apply without fuzz to current package. * Tue Mar 03 2009 sndirsch@suse.de