diff --git a/.gear/rules b/.gear/rules index 1fb484d..a658ecc 100644 --- a/.gear/rules +++ b/.gear/rules @@ -1 +1,2 @@ +copy: *.patch tar.xz: spiceterm name=spiceterm diff --git a/pve-spiceterm.spec b/pve-spiceterm.spec index a4d36b2..e310152 100644 --- a/pve-spiceterm.spec +++ b/pve-spiceterm.spec @@ -4,7 +4,7 @@ Name: pve-%sname Summary: SPICE Terminal Emulator Version: 3.1.1 -Release: alt3 +Release: alt4 License: GPLv2 Group: Networking/WWW Url: https://git.proxmox.com/ @@ -13,6 +13,7 @@ Packager: Valery Inozemtsev ExclusiveArch: x86_64 aarch64 Source0: %sname.tar.xz +Patch0: spiceterm-keymaps.patch BuildRequires: glib2-devel libspice-server-devel perl-podlators @@ -22,6 +23,7 @@ output to any SPICE client (simulating a xterm Terminal). %prep %setup -q -n %sname +%patch0 -p1 -b .kvm sed -i 's|\ -Werror||' src/Makefile @@ -36,6 +38,9 @@ sed -i 's|\ -Werror||' src/Makefile %_man1dir/%sname.1* %changelog +* Mon Jan 18 2021 Valery Inozemtsev 3.1.1-alt4 +- fixed keymaps path (closes: #39553) + * Sun Mar 22 2020 Valery Inozemtsev 3.1.1-alt3 - fixed build diff --git a/spiceterm-keymaps.patch b/spiceterm-keymaps.patch new file mode 100644 index 0000000..84d6bd7 --- /dev/null +++ b/spiceterm-keymaps.patch @@ -0,0 +1,22 @@ +--- spiceterm/src/input.c.kvm 2019-05-23 19:19:12.000000000 +0300 ++++ spiceterm/src/input.c 2021-01-18 13:28:27.636800007 +0300 +@@ -732,7 +732,7 @@ parse_keymap(const char *language) + } + } + +- char *filename = g_strdup_printf("/usr/share/kvm/keymaps/%s", language); ++ char *filename = g_strdup_printf("/usr/share/qemu/keymaps/%s", language); + FILE *f = fopen(filename, "r"); + g_free(filename); + if (!f) { +--- spiceterm/src/spiceterm.pod.kvm 2019-05-23 19:19:12.000000000 +0300 ++++ spiceterm/src/spiceterm.pod 2021-01-18 13:28:11.435759834 +0300 +@@ -49,7 +49,7 @@ the C environment variable + + Due to SPICE protocol limitation, you need to specify the keyboard + layout used by the client. We currently use the keymap files from kvm +-(/usr/share/kvm/keymaps/). ++(/usr/share/qemu/keymaps/). + + # spiceterm --keymap de +