From f7e5631402644ba8a5202daebd151af345f2ec95f550cd7ea1e9f9cb44de3a07 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Fri, 25 Apr 2008 14:28:19 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kbd?expand=0&rev=14 --- bnc147581_jp106.diff | 11 +++++++++++ kbd.changes | 5 +++++ kbd.spec | 18 +++++++++++------- 3 files changed, 27 insertions(+), 7 deletions(-) create mode 100644 bnc147581_jp106.diff diff --git a/bnc147581_jp106.diff b/bnc147581_jp106.diff new file mode 100644 index 0000000..f0dc83a --- /dev/null +++ b/bnc147581_jp106.diff @@ -0,0 +1,11 @@ +--- kbd-1.12/data/keymaps/i386/qwerty/jp106.map.orig 2008-04-25 11:58:38.000000000 +0200 ++++ kbd-1.12/data/keymaps/i386/qwerty/jp106.map 2008-04-25 12:00:26.504126000 +0200 +@@ -24,7 +24,7 @@ + keycode 8 = seven apostrophe + keycode 9 = eight parenleft + keycode 10 = nine parenright +-keycode 11 = zero asciitilde ++keycode 11 = zero underscore + control keycode 11 = nul + keycode 12 = minus equal + keycode 13 = asciicircum asciitilde diff --git a/kbd.changes b/kbd.changes index f2b1614..dd2d269 100644 --- a/kbd.changes +++ b/kbd.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Apr 25 12:11:45 CEST 2008 - jw@suse.de + +- experimental patch for bnc#147581 added. + ------------------------------------------------------------------- Fri Mar 21 18:47:50 CET 2008 - sndirsch@suse.de diff --git a/kbd.spec b/kbd.spec index facea9e..7d37e20 100644 --- a/kbd.spec +++ b/kbd.spec @@ -17,7 +17,7 @@ License: GPL v2 or later Group: System/Console AutoReqProv: on Version: 1.12 -Release: 166 +Release: 173 Summary: Keyboard and Font Utilities Source: ftp://ftp.win.tue.nl/pub/home/aeb/linux-local/utils/kbd/%{name}-%{version}.tar.bz2 Source1: kbd_fonts.tar.bz2 @@ -58,6 +58,7 @@ Patch24: kbd-%{version}-el-locale-update.diff Patch25: sv-latin1-keycode10.diff Patch26: kbd-%{version}-setfont-no-cruft.diff Patch27: kbd-%{version}-be-nice-to-kdm.diff +Patch28: bnc147581_jp106.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: %fillup_prereq %insserv_prereq BuildRequires: bison flex @@ -112,6 +113,7 @@ Authors: %patch25 -p1 %patch26 -p1 # %patch27 -p1 # obsoleted. #302010 +%patch28 -p1 %build for i in `find data/keymaps/mac -type f` ; do @@ -324,6 +326,8 @@ rm -rf $RPM_BUILD_ROOT #rm -rf $RPM_BUILD_DIR/kbd-%{version} %changelog +* Fri Apr 25 2008 jw@suse.de +- experimental patch for bnc#147581 added. * Fri Mar 21 2008 sndirsch@suse.de - kbd.init: MAY_TTY should be tty6 (Bug #302010) * Thu Feb 21 2008 crrodriguez@suse.de @@ -511,7 +515,7 @@ rm -rf $RPM_BUILD_ROOT - Tentative fix for dumpkeys, using the large NR_KEYS from 2.6 kernel but running on 2.4 [#28339] - Use RPM_OPT_FLAGS (with -Os appended) -* Wed Jul 30 2003 garloff@suse.de +* Thu Jul 31 2003 garloff@suse.de - Update to kbd-1.08: * loadkeys: fix for bison 1.50 * Makefile cleanups @@ -611,7 +615,7 @@ rm -rf $RPM_BUILD_ROOT * Mon Mar 18 2002 garloff@suse.de - Changed init script to accept a keymap that is specified by absolute path. (Bug #14997) -* Sun Mar 17 2002 garloff@suse.de +* Mon Mar 18 2002 garloff@suse.de - Add some missing third (AltGr) functions to the number keys for fr_CH/de_CH-latin and sg-latin1. (Adresses bug #9368) * Tue Mar 12 2002 olh@suse.de @@ -794,7 +798,7 @@ rm -rf $RPM_BUILD_ROOT (Bugzilla #4468) * Tue Nov 28 2000 kukuk@suse.de - New initscript in /etc/init.d -* Fri Oct 20 2000 kukuk@suse.de +* Sat Oct 21 2000 kukuk@suse.de - Fix filelist on SPARC * Thu Oct 05 2000 olh@suse.de - remove mac-de2-ext.map, obsolete @@ -804,7 +808,7 @@ rm -rf $RPM_BUILD_ROOT - mount proc on ppc, needed for runlevel S * Tue Aug 22 2000 olh@suse.de - update spec file and use only one dif, add mac-pt map, fix maps -* Sat Aug 05 2000 garloff@suse.de +* Sun Aug 06 2000 garloff@suse.de - Only include kbdrate in kbd package, if it's not already in util If not, install it in /sbin, just like util did before. - Remove the README files and ERRORS from /usr/lib/kbd/consolefonts @@ -861,7 +865,7 @@ rm -rf $RPM_BUILD_ROOT - Add openvt to the file list * Sun Feb 27 2000 kukuk@suse.de - Move /usr/man -> /usr/share/man -* Thu Dec 09 1999 olh@suse.de +* Fri Dec 10 1999 olh@suse.de - Added i386 keys to mac-de.map, @|\~ make Symlink mac -> ppc relative * Thu Nov 11 1999 kukuk@suse.de @@ -922,7 +926,7 @@ rm -rf $RPM_BUILD_ROOT - added the following keymaps: br-abnt2, Pl02, sk-qwerty - added the new version of iso07 fonts with SuSE extensions including unicode map file -* Sun Dec 13 1998 bs@suse.de +* Mon Dec 14 1998 bs@suse.de - removed /var/adm/setup/setup.fontconfig * Sat Dec 05 1998 bs@suse.de - let start script say, that a "keymap" is loaded.