Compare commits
1 commit
| Author | SHA1 | Date | |
|---|---|---|---|
|
07242305f6 |
9 changed files with 135 additions and 226 deletions
3
.gitignore
vendored
3
.gitignore
vendored
|
|
@ -9,5 +9,4 @@ terminus.tar.bz2
|
|||
/fr-dvorak.tar.bz2
|
||||
/kbd-latarcyrheb-32.tar.bz2
|
||||
/kbdinfo.1
|
||||
/kbd-2.9.0.tar.xz
|
||||
/kbd-2.10.0.tar.xz
|
||||
/kbd-2.5.1.tar.xz
|
||||
|
|
|
|||
|
|
@ -0,0 +1,30 @@
|
|||
From d8aa08c7f3096fbb2901d1b9f93473ca9ba1d342 Mon Sep 17 00:00:00 2001
|
||||
From: Adam Williamson <awilliam@redhat.com>
|
||||
Date: Thu, 21 Oct 2021 14:08:24 -0700
|
||||
Subject: [PATCH] fa.map: drop high codepoint character that chokes loadkeys
|
||||
|
||||
fa.map contains a mapping for Unicode character U+FDFC. However,
|
||||
loadkeys refuses to load any map containing a codepoint over
|
||||
U+F000. To avoid the map failing to load entirely, let's remove
|
||||
the problematic character.
|
||||
|
||||
Signed-off-by: Adam Williamson <awilliam@redhat.com>
|
||||
---
|
||||
data/keymaps/i386/qwerty/fa.map | 1 -
|
||||
1 file changed, 1 deletion(-)
|
||||
|
||||
diff --git a/data/keymaps/i386/qwerty/fa.map b/data/keymaps/i386/qwerty/fa.map
|
||||
index 9ea0a7a..9aa5284 100644
|
||||
--- a/data/keymaps/i386/qwerty/fa.map
|
||||
+++ b/data/keymaps/i386/qwerty/fa.map
|
||||
@@ -44,7 +44,6 @@ altgr keycode 57 = U+0020 # SPACE
|
||||
altgr shift keycode 2 = U+0021 # EXCLAMATION MARK
|
||||
altgr shift keycode 40 = U+061B # ARABIC SEMICOLON
|
||||
altgr shift keycode 4 = U+066B # ARABIC DECIMAL SEPARATOR
|
||||
-altgr shift keycode 5 = U+FDFC # RIAL SIGN
|
||||
altgr shift keycode 6 = U+066A # ARABIC PERCENT SIGN
|
||||
altgr shift keycode 8 = U+060C # ARABIC COMMA
|
||||
altgr keycode 40 = U+06AF # ARABIC LETTER GAF
|
||||
--
|
||||
2.33.0
|
||||
|
||||
|
|
@ -1,10 +1,11 @@
|
|||
diff -up kbd-2.7-rc1/docs/man/man1/showkey.1.orig kbd-2.7-rc1/docs/man/man1/showkey.1
|
||||
--- kbd-2.7-rc1/docs/man/man1/showkey.1.orig 2024-10-25 10:52:17.000000000 +0200
|
||||
+++ kbd-2.7-rc1/docs/man/man1/showkey.1 2024-10-29 11:59:53.540044621 +0100
|
||||
@@ -84,6 +84,17 @@ corresponds to what the keyboard hardwar
|
||||
diff -up kbd-2.3.0/docs/man/man1/showkey.1.orig kbd-2.3.0/docs/man/man1/showkey.1
|
||||
--- kbd-2.3.0/docs/man/man1/showkey.1.orig 2020-07-08 19:25:47.000000000 +0200
|
||||
+++ kbd-2.3.0/docs/man/man1/showkey.1 2020-07-16 08:56:15.970254183 +0200
|
||||
@@ -84,6 +84,19 @@ corresponds to what the keyboard hardwar
|
||||
to know the scan codes sent by various keys it is better to boot a
|
||||
2.4 kernel. Since 2.6.9 there also is the boot option atkbd.softraw=0
|
||||
that tells the 2.6 kernel to return the actual scan codes.
|
||||
+
|
||||
+.SH NOTES
|
||||
+The raw scan codes are available only on AT and PS/2 keyboards,
|
||||
+and even then they are disabled unless the
|
||||
|
|
@ -16,13 +17,14 @@ diff -up kbd-2.7-rc1/docs/man/man1/showkey.1.orig kbd-2.7-rc1/docs/man/man1/show
|
|||
+can affect the output of
|
||||
+.B showkey
|
||||
+in scan code dump mode.
|
||||
.SH AUTHORS
|
||||
Andries Brouwer <aeb@cwi.nl>
|
||||
+
|
||||
.SH "SEE ALSO"
|
||||
diff -up kbd-2.7-rc1/docs/man/man8/setkeycodes.8.orig kbd-2.7-rc1/docs/man/man8/setkeycodes.8
|
||||
--- kbd-2.7-rc1/docs/man/man8/setkeycodes.8.orig 2024-10-24 19:15:13.000000000 +0200
|
||||
+++ kbd-2.7-rc1/docs/man/man8/setkeycodes.8 2024-10-29 12:01:28.367235566 +0100
|
||||
@@ -43,6 +43,10 @@ the command
|
||||
.BR loadkeys (1),
|
||||
.BR dumpkeys (1),
|
||||
diff -up kbd-2.3.0/docs/man/man8/setkeycodes.8.orig kbd-2.3.0/docs/man/man8/setkeycodes.8
|
||||
--- kbd-2.3.0/docs/man/man8/setkeycodes.8.orig 2020-07-08 19:35:35.000000000 +0200
|
||||
+++ kbd-2.3.0/docs/man/man8/setkeycodes.8 2020-07-16 08:57:52.293900997 +0200
|
||||
@@ -42,6 +42,10 @@ the command
|
||||
will assign the keycode 112 to it, and then
|
||||
.BR loadkeys (1)
|
||||
can be used to define the function of this key.
|
||||
|
|
@ -33,7 +35,7 @@ diff -up kbd-2.7-rc1/docs/man/man8/setkeycodes.8.orig kbd-2.7-rc1/docs/man/man8/
|
|||
.LP
|
||||
Some older kernels might hardwire a low scancode range to the
|
||||
equivalent keycodes; setkeycodes will fail when you try to remap
|
||||
@@ -69,6 +73,14 @@ print this usage message.
|
||||
@@ -60,6 +64,14 @@ None.
|
||||
.SH BUGS
|
||||
The keycodes of X have nothing to do with those of Linux.
|
||||
Unusual keys can be made visible under Linux, but not under X.
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
diff -up kbd-2.7-rc1/docs/man/man8/kbdrate.8.orig kbd-2.7-rc1/docs/man/man8/kbdrate.8
|
||||
--- kbd-2.7-rc1/docs/man/man8/kbdrate.8.orig 2023-08-09 13:57:23.000000000 +0200
|
||||
+++ kbd-2.7-rc1/docs/man/man8/kbdrate.8 2024-10-29 12:03:53.354503358 +0100
|
||||
diff -up kbd-2.1.0/docs/man/man8/kbdrate.8.orig kbd-2.1.0/docs/man/man8/kbdrate.8
|
||||
--- kbd-2.1.0/docs/man/man8/kbdrate.8.orig 2019-06-21 10:08:17.000000000 +0200
|
||||
+++ kbd-2.1.0/docs/man/man8/kbdrate.8 2019-07-17 10:36:19.876499648 +0200
|
||||
@@ -19,7 +19,7 @@ Using
|
||||
without any options will reset the repeat rate to 10.9 characters per second (cps)
|
||||
and the delay to 250 milliseconds (ms) for Intel- and M68K-based systems.
|
||||
|
|
@ -10,9 +10,9 @@ diff -up kbd-2.7-rc1/docs/man/man8/kbdrate.8.orig kbd-2.7-rc1/docs/man/man8/kbdr
|
|||
|
||||
.SH OPTIONS
|
||||
.TP
|
||||
diff -up kbd-2.7-rc1/src/kbdrate.c.orig kbd-2.7-rc1/src/kbdrate.c
|
||||
--- kbd-2.7-rc1/src/kbdrate.c.orig 2024-10-19 00:12:27.000000000 +0200
|
||||
+++ kbd-2.7-rc1/src/kbdrate.c 2024-10-29 12:08:24.289921559 +0100
|
||||
diff -up kbd-2.1.0/src/kbdrate.c.orig kbd-2.1.0/src/kbdrate.c
|
||||
--- kbd-2.1.0/src/kbdrate.c.orig 2019-07-02 17:44:57.000000000 +0200
|
||||
+++ kbd-2.1.0/src/kbdrate.c 2019-07-17 11:07:04.732486323 +0200
|
||||
@@ -114,9 +114,12 @@ static int print_only = 0;
|
||||
static int
|
||||
KDKBDREP_ioctl_ok(double rate, int delay, int silent)
|
||||
|
|
@ -55,8 +55,8 @@ diff -up kbd-2.7-rc1/src/kbdrate.c.orig kbd-2.7-rc1/src/kbdrate.c
|
|||
}
|
||||
|
||||
#ifdef __sparc__
|
||||
-static double rate = 5.0; /* Default rate */
|
||||
+static double rate = 20.0; /* Default rate */
|
||||
static int delay = 200; /* Default delay */
|
||||
-double rate = 5.0; /* Default rate */
|
||||
+double rate = 20.0; /* Default rate */
|
||||
int delay = 200; /* Default delay */
|
||||
#else
|
||||
static double rate = 10.9; /* Default rate */
|
||||
double rate = 10.9; /* Default rate */
|
||||
|
|
|
|||
|
|
@ -1,24 +1,24 @@
|
|||
diff -up kbd-2.7-rc1/configure.ac.orig kbd-2.7-rc1/configure.ac
|
||||
--- kbd-2.7-rc1/configure.ac.orig 2024-10-28 16:18:31.000000000 +0100
|
||||
+++ kbd-2.7-rc1/configure.ac 2024-10-29 12:15:12.915552224 +0100
|
||||
@@ -156,6 +156,8 @@ AC_DEFUN([KBD_SUBST_DEFINE], [
|
||||
|
||||
KBD_SUBST_DEFINE([OLDKEYMAPDIR], ["keytables"], [Subdirectory of DATADIR])
|
||||
KBD_SUBST_DEFINE([KEYMAPDIR], ["keymaps"], [Subdirectory of DATADIR])
|
||||
+KBD_SUBST_DEFINE([XKBKEYMAPDIR], ["keymaps/xkb"], [Subdirectory of DATADIR])
|
||||
+KBD_SUBST_DEFINE([LEGACYKEYMAPDIR], ["keymaps/legacy"], [Subdirectory of DATADIR])
|
||||
KBD_SUBST_DEFINE([UNIMAPDIR], ["unimaps"], [Subdirectory of DATADIR])
|
||||
KBD_SUBST_DEFINE([TRANSDIR], ["consoletrans"], [Subdirectory of DATADIR])
|
||||
KBD_SUBST_DEFINE([VIDEOMODEDIR], ["videomodes"], [Subdirectory of DATADIR])
|
||||
diff -up kbd-2.7-rc1/src/loadkeys.c.orig kbd-2.7-rc1/src/loadkeys.c
|
||||
--- kbd-2.7-rc1/src/loadkeys.c.orig 2024-10-19 00:12:27.000000000 +0200
|
||||
+++ kbd-2.7-rc1/src/loadkeys.c 2024-10-29 12:17:24.519755349 +0100
|
||||
@@ -26,6 +26,8 @@
|
||||
|
||||
diff -up kbd-2.3.0/src/loadkeys.c.orig kbd-2.3.0/src/loadkeys.c
|
||||
--- kbd-2.3.0/src/loadkeys.c.orig 2020-06-02 12:16:45.000000000 +0200
|
||||
+++ kbd-2.3.0/src/loadkeys.c 2020-07-16 09:02:50.398864688 +0200
|
||||
@@ -28,6 +28,8 @@
|
||||
static const char *const dirpath1[] = {
|
||||
"",
|
||||
DATADIR "/" KEYMAPDIR "/**",
|
||||
+ DATADIR "/" XKBKEYMAPDIR "/",
|
||||
+ DATADIR "/" LEGACYKEYMAPDIR "/**",
|
||||
KERNDIR "/",
|
||||
NULL
|
||||
};
|
||||
diff -up kbd-2.3.0/src/paths.h.orig kbd-2.3.0/src/paths.h
|
||||
--- kbd-2.3.0/src/paths.h.orig 2020-07-16 09:02:59.243010909 +0200
|
||||
+++ kbd-2.3.0/src/paths.h 2020-07-16 09:03:23.446410942 +0200
|
||||
@@ -5,6 +5,8 @@
|
||||
* The following five subdirectories are defined:
|
||||
*/
|
||||
#define KEYMAPDIR "keymaps"
|
||||
+#define XKBKEYMAPDIR "keymaps/xkb"
|
||||
+#define LEGACYKEYMAPDIR "keymaps/legacy"
|
||||
#define UNIMAPDIR "unimaps"
|
||||
#define TRANSDIR "consoletrans"
|
||||
#define VIDEOMODEDIR "videomodes"
|
||||
|
|
|
|||
|
|
@ -1,84 +0,0 @@
|
|||
diff -up kbd-2.7-rc1/src/vlock/auth.c.orig kbd-2.7-rc1/src/vlock/auth.c
|
||||
--- kbd-2.7-rc1/src/vlock/auth.c.orig 2024-10-09 15:14:58.000000000 +0200
|
||||
+++ kbd-2.7-rc1/src/vlock/auth.c 2024-10-29 12:20:40.451059945 +0100
|
||||
@@ -91,6 +91,12 @@ int get_password(pam_handle_t *pamh, con
|
||||
}
|
||||
fflush(stdout);
|
||||
|
||||
+ if (prompt) {
|
||||
+ printf(_("Press ENTER to continue.\n"));
|
||||
+ fflush(stdout);
|
||||
+ (void )getchar();
|
||||
+ }
|
||||
+
|
||||
/*
|
||||
* No need to request a delay on failure via pam_fail_delay(3):
|
||||
* authentication module should do it for us.
|
||||
diff -up kbd-2.7-rc1/src/vlock/parse.c.orig kbd-2.7-rc1/src/vlock/parse.c
|
||||
--- kbd-2.7-rc1/src/vlock/parse.c.orig 2024-10-19 00:12:27.000000000 +0200
|
||||
+++ kbd-2.7-rc1/src/vlock/parse.c 2024-10-29 12:23:51.730369348 +0100
|
||||
@@ -39,6 +39,13 @@
|
||||
*/
|
||||
int o_lock_all;
|
||||
|
||||
+/*
|
||||
+ * This determines whether there will be prompt before invoking pam
|
||||
+ * auth stack.
|
||||
+ * 0 means no, 1 means yes.
|
||||
+ */
|
||||
+int prompt;
|
||||
+
|
||||
const char *
|
||||
locked_name(void)
|
||||
{
|
||||
@@ -64,6 +71,8 @@ show_help(void)
|
||||
" switch to other virtual consoles.\n"
|
||||
"-a or --all: lock all virtual consoles by preventing other users\n"
|
||||
" from switching virtual consoles.\n"
|
||||
+ "-p or --prompt: wait for keypress before invoking pam auth stack,\n"
|
||||
+ " useful for unlocking with smartcard setup.\n"
|
||||
"-v or --version: Print the version number of vlock and exit.\n"
|
||||
"-h or --help: Print this help message and exit.\n"),
|
||||
program_invocation_short_name, program_invocation_short_name);
|
||||
@@ -75,13 +84,14 @@ void parse(int ac, char *const av[])
|
||||
static struct option long_options[] = {
|
||||
{ "current", 0, NULL, 'c' },
|
||||
{ "all", 0, NULL, 'a' },
|
||||
+ { "prompt", 0, NULL, 'p' },
|
||||
{ "version", 0, NULL, 'v' },
|
||||
{ "help", 0, NULL, 'h' },
|
||||
{ NULL, 0, NULL, 0 },
|
||||
};
|
||||
int c;
|
||||
|
||||
- while ((c = getopt_long(ac, av, "acvh", long_options, NULL)) != -1) {
|
||||
+ while ((c = getopt_long(ac, av, "acpvh", long_options, NULL)) != -1) {
|
||||
switch (c) {
|
||||
case 'c':
|
||||
o_lock_all = 0;
|
||||
@@ -89,6 +99,9 @@ void parse(int ac, char *const av[])
|
||||
case 'a':
|
||||
o_lock_all = 1;
|
||||
break;
|
||||
+ case 'p':
|
||||
+ prompt = 1;
|
||||
+ break;
|
||||
case 'v':
|
||||
fprintf(stderr, "%s\n", VERSION);
|
||||
exit(EXIT_SUCCESS);
|
||||
diff -up kbd-2.7-rc1/src/vlock/vlock.h.orig kbd-2.7-rc1/src/vlock/vlock.h
|
||||
--- kbd-2.7-rc1/src/vlock/vlock.h.orig 2024-10-08 12:35:16.000000000 +0200
|
||||
+++ kbd-2.7-rc1/src/vlock/vlock.h 2024-10-29 12:24:21.315417215 +0100
|
||||
@@ -40,5 +40,12 @@ const char *locked_name(void);
|
||||
*/
|
||||
extern int o_lock_all;
|
||||
|
||||
+/*
|
||||
+ * This determines whether there will be prompt before invoking pam
|
||||
+ * auth stack.
|
||||
+ * 0 means no, 1 means yes.
|
||||
+ */
|
||||
+extern int prompt;
|
||||
+
|
||||
/* Copy of the VT mode when the program was started. */
|
||||
extern int is_vt;
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
diff -up kbd-2.6.1/src/libkfont/psffontop.c.orig kbd-2.6.1/src/libkfont/psffontop.c
|
||||
--- kbd-2.6.1/src/libkfont/psffontop.c.orig 2023-06-23 10:29:44.000000000 +0200
|
||||
+++ kbd-2.6.1/src/libkfont/psffontop.c 2023-06-30 14:06:06.363944776 +0200
|
||||
@@ -236,6 +236,7 @@ kfont_read_psffont(struct kfont_context
|
||||
diff -up kbd-2.4.0/src/libkfont/psffontop.c.orig kbd-2.4.0/src/libkfont/psffontop.c
|
||||
--- kbd-2.4.0/src/libkfont/psffontop.c.orig 2020-04-27 17:53:01.000000000 +0200
|
||||
+++ kbd-2.4.0/src/libkfont/psffontop.c 2021-04-27 09:59:14.170153676 +0200
|
||||
@@ -235,6 +235,7 @@ kfont_read_psffont(struct kfont_context
|
||||
|
||||
if (psfhdr->mode > PSF1_MAXMODE) {
|
||||
KFONT_ERR(ctx, _("Unsupported psf file mode (%d)"), psfhdr->mode);
|
||||
|
|
@ -9,3 +9,41 @@ diff -up kbd-2.6.1/src/libkfont/psffontop.c.orig kbd-2.6.1/src/libkfont/psffonto
|
|||
return -EX_DATAERR;
|
||||
}
|
||||
fontlen = ((psfhdr->mode & PSF1_MODE512) ? 512 : 256);
|
||||
@@ -251,6 +252,7 @@ kfont_read_psffont(struct kfont_context
|
||||
|
||||
if (psfhdr.version > PSF2_MAXVERSION) {
|
||||
KFONT_ERR(ctx, _("Unsupported psf version (%d)"), psfhdr.version);
|
||||
+ free(inputbuf);
|
||||
return -EX_DATAERR;
|
||||
}
|
||||
fontlen = assemble_uint32((unsigned char *)&psfhdr.length);
|
||||
@@ -260,16 +262,20 @@ kfont_read_psffont(struct kfont_context
|
||||
ftoffset = assemble_uint32((unsigned char *)&psfhdr.headersize);
|
||||
fontwidth = assemble_uint32((unsigned char *)&psfhdr.width);
|
||||
utf8 = 1;
|
||||
- } else
|
||||
+ } else {
|
||||
+ free(inputbuf);
|
||||
return -EX_DATAERR; /* not psf */
|
||||
+ }
|
||||
|
||||
/* tests required - we divide by these */
|
||||
if (fontlen == 0) {
|
||||
KFONT_ERR(ctx, _("zero input font length?"));
|
||||
+ free(inputbuf);
|
||||
return -EX_DATAERR;
|
||||
}
|
||||
if (charsize == 0) {
|
||||
KFONT_ERR(ctx, _("zero input character size?"));
|
||||
+ free(inputbuf);
|
||||
return -EX_DATAERR;
|
||||
}
|
||||
|
||||
@@ -277,6 +283,7 @@ kfont_read_psffont(struct kfont_context
|
||||
|
||||
if (i > inputlth || (!hastable && i != inputlth)) {
|
||||
KFONT_ERR(ctx, _("Input file: bad input length (%d)"), inputlth);
|
||||
+ free(inputbuf);
|
||||
return -EX_DATAERR;
|
||||
}
|
||||
|
||||
|
|
|
|||
118
kbd.spec
118
kbd.spec
|
|
@ -4,10 +4,10 @@
|
|||
%global kbd_datadir %{_exec_prefix}/lib/kbd
|
||||
|
||||
Name: kbd
|
||||
Version: 2.10.0
|
||||
Release: 2%{?dist}
|
||||
Version: 2.5.1
|
||||
Release: 5%{?dist}
|
||||
Summary: Tools for configuring the console (keyboard, virtual terminals, etc.)
|
||||
License: GPL-2.0-or-later
|
||||
License: GPLv2+
|
||||
URL: http://www.kbd-project.org/
|
||||
|
||||
Source0: ftp://ftp.altlinux.org/pub/people/legion/kbd/kbd-%{version}.tar.xz
|
||||
|
|
@ -32,18 +32,17 @@ Patch4: kbd-1.15.5-loadkeys-search-path.patch
|
|||
Patch5: kbd-2.0.2-unicode-start-font.patch
|
||||
# Patch6: fixes issues found by static analysis
|
||||
Patch6: kbd-2.4.0-covscan-fixes.patch
|
||||
# Patch7: adds vlock option to issue prompt before invokation of pam stack
|
||||
Patch7: kbd-2.0.4-vlock-add-prompt-option.patch
|
||||
|
||||
BuildRequires: gcc, bison, flex, gettext, pam-devel, check-devel, automake, make
|
||||
BuildRequires: console-setup, xkeyboard-config, libxkbcommon-devel
|
||||
BuildRequires: gcc, bison, flex, gettext, pam-devel, check-devel, automake
|
||||
BuildRequires: console-setup, xkeyboard-config
|
||||
BuildRequires: make
|
||||
Requires: %{name}-misc = %{version}-%{release}
|
||||
Requires: %{name}-legacy = %{version}-%{release}
|
||||
# Be sure that system is after UsrMove
|
||||
Conflicts: filesystem < 3
|
||||
Provides: vlock = %{version}
|
||||
Conflicts: vlock <= 1.3
|
||||
Obsoletes: vlock < 1.3-34
|
||||
Obsoletes: vlock
|
||||
|
||||
%description
|
||||
The %{name} package contains tools for managing a Linux
|
||||
|
|
@ -70,7 +69,13 @@ Please note that %{name}-legacy is not helpful without kbd.
|
|||
%setup -q -a 1 -a 2
|
||||
cp -fp %{SOURCE3} .
|
||||
cp -fp %{SOURCE6} .
|
||||
%autopatch -p1
|
||||
%patch0 -p1 -b .keycodes-man
|
||||
%patch1 -p1 -b .sparc
|
||||
%patch2 -p1 -b .unicode_start
|
||||
%patch3 -p1 -b .sg-decimal-separator
|
||||
%patch4 -p1 -b .loadkeys-search-path
|
||||
%patch5 -p1 -b .unicode-start-font
|
||||
%patch6 -p1 -b .covscan-fixes
|
||||
aclocal
|
||||
autoconf
|
||||
|
||||
|
|
@ -101,8 +106,7 @@ iconv -f iso-8859-1 -t utf-8 < "ChangeLog" > "ChangeLog_"
|
|||
mv "ChangeLog_" "ChangeLog"
|
||||
|
||||
%build
|
||||
%configure --prefix=%{_prefix} --datadir=%{kbd_datadir} \
|
||||
--mandir=%{_mandir} --localedir=%{_datadir}/locale --enable-nls --enable-xkb
|
||||
%configure --prefix=%{_prefix} --datadir=%{kbd_datadir} --mandir=%{_mandir} --localedir=%{_datadir}/locale --enable-nls
|
||||
%make_build
|
||||
|
||||
%install
|
||||
|
|
@ -155,10 +159,6 @@ done < layouts-list-uniq.lst
|
|||
|
||||
# wipe converted layouts which cannot input ASCII (#1031848)
|
||||
zgrep -L "U+0041" $RPM_BUILD_ROOT%{kbd_datadir}/keymaps/xkb/* | xargs rm -f
|
||||
# wipe the xkb-converted georgian layout, it is unusable, see:
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=2336875
|
||||
# https://src.fedoraproject.org/rpms/kbd/pull-request/2#comment-239318
|
||||
rm -f $RPM_BUILD_ROOT%{kbd_datadir}/keymaps/xkb/ge.map.gz
|
||||
|
||||
# Fix converted cz layout - add compose rules, if exists
|
||||
if [ -f "$RPM_BUILD_ROOT%{kbd_datadir}/keymaps/xkb/cz.map.gz" ]; then
|
||||
|
|
@ -169,9 +169,14 @@ fi
|
|||
|
||||
%find_lang %{name}
|
||||
|
||||
%check
|
||||
%ifnarch s390x
|
||||
make check
|
||||
%endif
|
||||
|
||||
%files -f %{name}.lang
|
||||
%license COPYING
|
||||
%doc ChangeLog AUTHORS README docs/doc/font-formats/*.html docs/doc/dvorak/*
|
||||
%doc ChangeLog AUTHORS README docs/doc/kbd.FAQ*.html docs/doc/font-formats/*.html docs/doc/utf/utf* docs/doc/dvorak/*
|
||||
%{_bindir}/*
|
||||
%{_mandir}/*/*
|
||||
%config(noreplace) %{_sysconfdir}/pam.d/vlock
|
||||
|
|
@ -184,87 +189,6 @@ fi
|
|||
%{kbd_datadir}/keymaps/legacy
|
||||
|
||||
%changelog
|
||||
* Thu Jul 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 2.10.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
|
||||
|
||||
* Wed Jun 10 2026 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.10.0-1
|
||||
- Update to kbd-2.10.0
|
||||
Resolves: #2481141
|
||||
|
||||
* Tue Mar 24 2026 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.9.0-3
|
||||
- Fix setfont segmentation fault when argument for option is missing
|
||||
Resolves: #2447892
|
||||
|
||||
* Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
|
||||
|
||||
* Mon Sep 22 2025 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.9.0-1
|
||||
- Update to kbd-2.9.0
|
||||
Resolves: #2393145
|
||||
|
||||
* Thu Jul 24 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.8.0-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
|
||||
|
||||
* Tue Jul 15 2025 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.8.0-2
|
||||
- Fix kfont_load_font(): setfont killed by SIGSEGV
|
||||
Resolves: #2370214
|
||||
|
||||
* Mon Jun 09 2025 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.8.0-1
|
||||
- Update to kbd-2.8.0
|
||||
Resolves: #2369419
|
||||
|
||||
* Mon Jan 27 2025 Adam Williamson <awilliam@redhat.com> - 2.7.1-3
|
||||
- Add Georgian layout and font (from upstream PR #127)
|
||||
|
||||
* Fri Jan 17 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.7.1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
|
||||
|
||||
* Thu Jan 02 2025 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.7.1-1
|
||||
- Update to kbd-2.7.1
|
||||
Resolves: #2331264
|
||||
|
||||
* Tue Dec 17 2024 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.7-1
|
||||
- Update to kbd-2.7
|
||||
Resolves: #2331264
|
||||
|
||||
* Tue Sep 10 2024 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.6.4-5
|
||||
- Add vlock option to issue prompt before invokation of pam stack
|
||||
|
||||
* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.4-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
|
||||
|
||||
* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.4-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.4-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Fri Dec 15 2023 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.6.4-1
|
||||
- Update to kbd-2.6.4
|
||||
Resolves: #2254010
|
||||
|
||||
* Wed Sep 20 2023 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.6.3-1
|
||||
- Update to kbd-2.6.3
|
||||
Resolves: #2239620
|
||||
|
||||
* Thu Aug 24 2023 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.6.2-1
|
||||
- Update to kbd-2.6.2
|
||||
Resolves: #2232126
|
||||
|
||||
* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||
|
||||
* Mon Jul 03 2023 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.6.1-1
|
||||
- Update to kbd-2.6.1
|
||||
Resolves: #2218174
|
||||
|
||||
* Tue Jun 13 2023 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.6.0-1
|
||||
- Update to kbd-2.6.0
|
||||
Resolves: #2214279
|
||||
|
||||
* Fri May 26 2023 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.5.1-6
|
||||
- SPDX migration
|
||||
|
||||
* Tue Feb 21 2023 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.5.1-5
|
||||
- Update patch adding compose rules for converted cz layout
|
||||
Resolves: #2171583
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1,4 +1,4 @@
|
|||
SHA512 (kbd-latsun-fonts.tar.bz2) = b98da5df85017ef1bd297eb2255046d54dd805c84356db7533f24e49fb78c8e3999901a45a49cdf6a74c0002bba2e0aa8327469d78dd38b6e747103972c30584
|
||||
SHA512 (kbd-latarcyrheb-32.tar.bz2) = 1870a708e16cf16f8343f02f7e97940e8404655078f92709a0b8a334be772faa99b4dbaca37e8d8c5b16d0d4d811fe6b102e4f76ae821148eb33075613dc95b8
|
||||
SHA512 (kbdinfo.1) = 8696d55f6c15f0ee2c2936eca6180b18100a87b11f0efe809a9531bb1228c67cd096cbc8fa25d9ee496daab28892ee5f320cc4bc9c9d816ff666bb4f80271c99
|
||||
SHA512 (kbd-2.10.0.tar.xz) = 1b7f55f0a1b34d9b6b4237a1ff3e10eedf4bdebe50e906a7acdea48f85b3c455e72737127491a0c494388b999797aa65411b20b44c3f5612fdeee4d8289f937c
|
||||
SHA512 (kbd-2.5.1.tar.xz) = 74855f486aff5fc2f93a6cb29460a590c94eac653b001574e1b4eb1300ea99dfed9222f9e5d1d3a05a112a6880591d5c44ed6e76b8a64edf744ecb0892f562d0
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue