From 0593934957f03d2a74eb8ca17d718e9e09ab51436588aba206e277f2994cf27d Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Mon, 10 Nov 2008 14:22:02 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kbd?expand=0&rev=26 --- kbd.changes | 6 ++++++ kbd.spec | 32 ++++++++++++++++++++------------ 2 files changed, 26 insertions(+), 12 deletions(-) diff --git a/kbd.changes b/kbd.changes index 074235e..ae314cd 100644 --- a/kbd.changes +++ b/kbd.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Nov 10 12:10:09 CET 2008 - mmarek@suse.cz + +- rename Spanish keymap for olpc to es-olpc to avoid ambiguity + (bnc#435121) + ------------------------------------------------------------------- Tue Nov 4 13:06:35 CET 2008 - sndirsch@suse.de diff --git a/kbd.spec b/kbd.spec index 33292d2..7b24757 100644 --- a/kbd.spec +++ b/kbd.spec @@ -24,7 +24,7 @@ License: GPL v2 or later Group: System/Console AutoReqProv: on Version: 1.14.1 -Release: 15 +Release: 16 Summary: Keyboard and Font Utilities Source: kbd-%{version}.tar.bz2 Source1: kbd_fonts.tar.bz2 @@ -91,8 +91,13 @@ Authors: for i in `find data/keymaps/mac -type f` ; do sed -i -f %{S:42} $i done -# bugzilla #33301, but noclobber. -(cd data/keymaps/i386/qwerty; test -f se-latin1.map || cp sv-latin1.map se-latin1.map) +# workaround ambiguous keymap names +pushd data/keymaps/i386 + # bnc#48301 + test -f qwerty/se-latin1.map || cp qwerty/sv-latin1.map qwerty/se-latin1.map + # bnc#435121 + test -f olpc/es-olpc.map || mv olpc/es.map olpc/es-olpc.map +popd ./configure \ --prefix=/ \ --datadir=%{kbd} \ @@ -303,6 +308,9 @@ install -m 644 %SOURCE12 $RPM_BUILD_ROOT/%{_mandir}/man8/ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Nov 10 2008 mmarek@suse.cz +- rename Spanish keymap for olpc to es-olpc to avoid ambiguity + (bnc#435121) * Tue Nov 04 2008 sndirsch@suse.de - added arabic console keyboard link ( arabic -> us ) (bnc #441432) * Tue Oct 14 2008 mmarek@suse.cz @@ -632,7 +640,7 @@ rm -rf $RPM_BUILD_ROOT * Thu Aug 15 2002 olh@suse.de - fix some keys with kbd-1.06-mac-dk.diff do the symlinks in mac/all instead of mac/ -* Mon Aug 05 2002 olh@suse.de +* Sun Aug 04 2002 olh@suse.de - merge boot.setup into rckbd (#16476) * Fri Jul 26 2002 garloff@suse.de - Don't wait infinitely long for bit 1 of port 0x64 being 0. @@ -641,7 +649,7 @@ rm -rf $RPM_BUILD_ROOT of stderr. Bug #17168. * Wed Jul 24 2002 olh@suse.de - do not run boot.setup on iSeries by accident, kbdrate is bad -* Sat Jul 20 2002 olh@suse.de +* Fri Jul 19 2002 olh@suse.de - kbdrate does only work on PC style hardware, hangs on USB and ADB * Thu Jul 11 2002 garloff@suse.de - Removed dangling link to www.claudio.ch (bug #16933) @@ -666,11 +674,11 @@ rm -rf $RPM_BUILD_ROOT * Thu Jun 06 2002 garloff@suse.de - Add kbd rate and delay report (#16050). - Move fbset to X-SuSE-Should-Start. -* Mon Mar 18 2002 garloff@suse.de +* Sun Mar 17 2002 garloff@suse.de - Fixed all i386 keymaps with 99(PtrScr) = Control_backslash to VoidSymbol (but keeping the old meaning with Control) Fixes bug #8380. -* Mon Mar 18 2002 garloff@suse.de +* Sun Mar 17 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 @@ -743,7 +751,7 @@ rm -rf $RPM_BUILD_ROOT - handle the ppc64 in machine detection * Mon Sep 17 2001 garloff@suse.de - Add loadkezs->loadkeys symlink (#10752) -* Sat Sep 01 2001 olh@suse.de +* Fri Aug 31 2001 olh@suse.de - no keyboard on iSeries available * Wed Aug 29 2001 olh@suse.de - allow querty/us.map.gz as KEYTABLE, fix mac-dk map @@ -751,7 +759,7 @@ rm -rf $RPM_BUILD_ROOT - handle ppc64 in KBDLIB path as i386 * Mon Aug 06 2001 kukuk@suse.de - Fix comment about init script location [Bug #9494] -* Sun Jul 22 2001 olh@suse.de +* Sat Jul 21 2001 olh@suse.de - update search path for mac keymaps * Tue Jul 17 2001 garloff@suse.de - changed return value of status to 3 if not running. Fixes @@ -844,7 +852,7 @@ rm -rf $RPM_BUILD_ROOT problems with some keytables (bug #4275). * Tue Dec 05 2000 olh@suse.de - add mac-fr_CH.map -* Tue Dec 05 2000 garloff@suse.de +* Mon Dec 04 2000 garloff@suse.de - New startup script: Separate KEYMAP from COMPOSE maps. Add new rc.config variable COMPOSEMAP to allow setting of compose combi- nations defaulting to "latin1 latin1.add" @@ -902,7 +910,7 @@ rm -rf $RPM_BUILD_ROOT /usr/lib/kbd/consolefonts/lt-brim-8x14.psfu.gz /usr/lib/kbd/consoletrans/lt-brim.uni - kbd.spec: use of %%{_defaultdocdir} -* Mon May 01 2000 olh@suse.de +* Sun Apr 30 2000 olh@suse.de - update mac-fr.map * Wed Apr 05 2000 olh@suse.de - fix link to french mac map @@ -1007,6 +1015,6 @@ rm -rf $RPM_BUILD_ROOT - ready for autobuild * Tue Jun 03 1997 bs@suse.de - removed man page console.4.gz (included in ldpman) -* Mon Apr 14 1997 florian@suse.de +* Sun Apr 13 1997 florian@suse.de - update to new version 0.93 - mv documentation to /usr/doc