From 5963a84c57a60211ab623f931d866820c1dbb548cec0ada1770b169488858fe4 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Mon, 21 Mar 2011 14:16:07 +0000 Subject: [PATCH 1/2] Updating link to change in openSUSE:Factory/kbd revision 50.0 OBS-URL: https://build.opensuse.org/package/show/Base:System/kbd?expand=0&rev=5bd1b6398e5583ea8ab70b9e31780431 --- kbd.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kbd.spec b/kbd.spec index f06e32c..501cf6d 100644 --- a/kbd.spec +++ b/kbd.spec @@ -24,7 +24,7 @@ License: GPLv2+ Group: System/Console AutoReqProv: on Version: 1.15.2 -Release: 41 +Release: 42 Summary: Keyboard and Font Utilities Source: kbd-%{version}.tar.bz2 Source1: kbd_fonts.tar.bz2 From 77006dd446486a026f730db09a8e519aa41cac979bdf538b0ccadd75bf76549d Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Wed, 14 Sep 2011 14:52:28 +0000 Subject: [PATCH 2/2] Accepting request 82135 from home:sbrabec:branches:Base:System - Update to version 1.15.3: * kbdinfo: New utility to obtain information about console. * setvtrgb: New utility to set the virtual terminal RGB colors. * loadkeys: Add LOADKEYS_KEYMAP_PATH env variable. * loadkeys: Fix some memory leaks. * loadkeys: Do not set prefer_unicode for iso-8859-1. * loadkeys -a: Switch to ASCII mode. * loadkeys: Fix "compose as usual" for Unicode diacritics. * Add dvorak-ru keymap. * Add LatGrkCyr fonts. Added bnc#: (bnc#463801) OBS-URL: https://build.opensuse.org/request/show/82135 OBS-URL: https://build.opensuse.org/package/show/Base:System/kbd?expand=0&rev=31 --- kbd-1.15.3-po-es.patch | 12 ++++++++++++ kbd-1.15.3-repack.tar.bz2 | 3 +++ kbd-1.15.3.tar.bz2 | 3 +++ kbd.changes | 15 +++++++++++++++ kbd.spec | 31 ++++++++++++++++++++----------- 5 files changed, 53 insertions(+), 11 deletions(-) create mode 100644 kbd-1.15.3-po-es.patch create mode 100644 kbd-1.15.3-repack.tar.bz2 create mode 100644 kbd-1.15.3.tar.bz2 diff --git a/kbd-1.15.3-po-es.patch b/kbd-1.15.3-po-es.patch new file mode 100644 index 0000000..398adf1 --- /dev/null +++ b/kbd-1.15.3-po-es.patch @@ -0,0 +1,12 @@ +Index: kbd-1.15.3/po/es.po +=================================================================== +--- kbd-1.15.3.orig/po/es.po ++++ kbd-1.15.3/po/es.po +@@ -1361,7 +1361,6 @@ msgid "Found nothing to save\n" + msgstr "No se encontró nada que guardar\n" + + #: src/setfont.c:682 +-#, c-format + msgid "Saved %d-char %dx%d font file on %s\n" + msgstr "Se ha guardado el fichero de tipos %2$dx%3$d de %1$d caracteres en %s\n" + diff --git a/kbd-1.15.3-repack.tar.bz2 b/kbd-1.15.3-repack.tar.bz2 new file mode 100644 index 0000000..7a2a7b0 --- /dev/null +++ b/kbd-1.15.3-repack.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f3978357061ee63f1b9d2744d2468a0f71b19e221ac30da64a6f4f6423e3a111 +size 1060502 diff --git a/kbd-1.15.3.tar.bz2 b/kbd-1.15.3.tar.bz2 new file mode 100644 index 0000000..ab0b948 --- /dev/null +++ b/kbd-1.15.3.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f813be5992432ea9cab0fbff032fe0ec0aae7cbb4357af9fae85b59417e797f1 +size 1053049 diff --git a/kbd.changes b/kbd.changes index f051bb2..285d68a 100644 --- a/kbd.changes +++ b/kbd.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Wed Sep 14 15:58:43 CEST 2011 - sbrabec@suse.cz + +- Update to version 1.15.3: + * kbdinfo: New utility to obtain information about console. + * setvtrgb: New utility to set the virtual terminal RGB colors. + * loadkeys: Add LOADKEYS_KEYMAP_PATH env variable. + * loadkeys: Fix some memory leaks. + * loadkeys: Do not set prefer_unicode for iso-8859-1. + * loadkeys -a: Switch to ASCII mode. + * loadkeys: Fix "compose as usual" for Unicode diacritics. + * Add dvorak-ru keymap. + * Add LatGrkCyr fonts. + ------------------------------------------------------------------- Mon Mar 21 14:07:36 CET 2011 - werner@suse.de @@ -15,6 +29,7 @@ Wed Jan 12 14:22:09 UTC 2011 - lnussel@suse.de - use /etc/defkeymap.name if possible to avoid find call - move some code that is only needed for start to actual start section + (bnc#463801) - Fixed symlink vulnerability of the init script (bnc#663898, CVE-2011-0460). diff --git a/kbd.spec b/kbd.spec index 501cf6d..92f67d2 100644 --- a/kbd.spec +++ b/kbd.spec @@ -23,10 +23,14 @@ Url: ftp://ftp.altlinux.org/pub/people/legion/kbd/ License: GPLv2+ Group: System/Console AutoReqProv: on -Version: 1.15.2 -Release: 42 +Version: 1.15.3 +Release: 0 Summary: Keyboard and Font Utilities +%if 0 Source: kbd-%{version}.tar.bz2 +%else +Source: kbd-%{version}-repack.tar.bz2 +%endif Source1: kbd_fonts.tar.bz2 Source2: suse-add.tar.bz2 Source3: README.SuSE @@ -41,15 +45,16 @@ Source12: fbtest.8 Source13: guess_encoding.pl Source42: convert-kbd-mac.sed Source43: repack_kbd.sh -Patch0: kbd-%{version}-prtscr_no_sigquit.patch -Patch1: kbd-%{version}-dumpkeys-ppc.patch -Patch2: kbd-%{version}-unicode_scripts.patch -Patch3: kbd-%{version}-docu-X11R6-xorg.patch -Patch4: kbd-%{version}-sv-latin1-keycode10.patch -Patch5: kbd-%{version}-setfont-no-cruft.patch -Patch6: kbd-%{version}-dumpkeys-C-opt.patch -Patch7: kbd-%{version}-defkeymap.patch -Patch8: kbd-%{version}-chvt-userwait.patch +Patch0: kbd-1.15.2-prtscr_no_sigquit.patch +Patch1: kbd-1.15.2-dumpkeys-ppc.patch +Patch2: kbd-1.15.2-unicode_scripts.patch +Patch3: kbd-1.15.2-docu-X11R6-xorg.patch +Patch4: kbd-1.15.2-sv-latin1-keycode10.patch +Patch5: kbd-1.15.2-setfont-no-cruft.patch +Patch6: kbd-1.15.2-dumpkeys-C-opt.patch +Patch7: kbd-1.15.2-defkeymap.patch +Patch8: kbd-1.15.2-chvt-userwait.patch +Patch9: kbd-%{version}-po-es.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: %fillup_prereq %insserv_prereq BuildRequires: bison flex @@ -83,6 +88,7 @@ Authors: %patch6 %patch7 -p1 %patch8 -p1 +%patch9 -p1 %build for i in `find data/keymaps/mac -type f` ; do @@ -262,6 +268,7 @@ install -m 755 %SOURCE13 $RPM_BUILD_ROOT/bin/guess_encoding %endif /bin/fgconsole /bin/kbd_mode +/bin/kbdinfo /bin/loadkeys /bin/loadunimap /bin/mapscrn @@ -275,6 +282,7 @@ install -m 755 %SOURCE13 $RPM_BUILD_ROOT/bin/guess_encoding /bin/setfont /bin/setleds /bin/setmetamode +/bin/setvtrgb /bin/showconsolefont /bin/showkey /bin/unicode_start @@ -311,6 +319,7 @@ install -m 755 %SOURCE13 $RPM_BUILD_ROOT/bin/guess_encoding %doc %{_mandir}/man8/mk_modmap.8.gz %doc %{_mandir}/man8/setlogcons.8.gz %doc %{_mandir}/man8/setvesablank.8.gz +%doc %{_mandir}/man8/setvtrgb.8.gz %doc %{_mandir}/man8/vcstime.8.gz %clean