From 9be1547f0d5c1f83a7d9f431d041096ec6943bab Mon Sep 17 00:00:00 2001 From: Valery Inozemtsev Date: Tue, 28 Jun 2016 08:01:07 +0000 Subject: [PATCH] 2.0-alt2 - fixed keymaps path --- pve-spiceterm.spec | 5 ++++- spiceterm-alt.patch | 26 ++++++++++++++++++++++++-- 2 files changed, 28 insertions(+), 3 deletions(-) diff --git a/pve-spiceterm.spec b/pve-spiceterm.spec index f72de7e..9b681d2 100644 --- a/pve-spiceterm.spec +++ b/pve-spiceterm.spec @@ -4,7 +4,7 @@ Name: pve-%sname Summary: SPICE Terminal Emulator Version: 2.0 -Release: alt1 +Release: alt2 License: GPLv2 Group: Networking/WWW Url: https://git.proxmox.com/ @@ -60,6 +60,9 @@ install -pD -m0644 %sname.1 %buildroot%_man1dir/%sname.1 %_man1dir/%sname.1* %changelog +* Tue Jun 28 2016 Valery Inozemtsev 2.0-alt2 +- fixed keymaps path + * Mon Mar 21 2016 Valery Inozemtsev 2.0-alt1 - initial release diff --git a/spiceterm-alt.patch b/spiceterm-alt.patch index 15058a4..81cc9ac 100644 --- a/spiceterm-alt.patch +++ b/spiceterm-alt.patch @@ -1,5 +1,5 @@ ---- spiceterm/Makefile.alt 2015-02-28 07:18:01.000000000 +0000 -+++ spiceterm/Makefile 2016-06-09 12:41:26.674229220 +0000 +--- spiceterm/Makefile.alt 2015-02-28 10:18:01.000000000 +0300 ++++ spiceterm/Makefile 2016-06-28 10:55:51.243470943 +0300 @@ -20,7 +20,9 @@ SOURCES=screen.c event_loop.c input.c sp all: ${PROGRAMS} @@ -11,3 +11,25 @@ genfont: genfont.c gcc -g -O2 -o $@ genfont.c -Wall -D_GNU_SOURCE -lz +--- spiceterm/input.c.alt 2015-02-28 10:18:01.000000000 +0300 ++++ spiceterm/input.c 2016-06-28 10:57:19.175452295 +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/spiceterm.pod.alt 2015-02-28 10:18:01.000000000 +0300 ++++ spiceterm/spiceterm.pod 2016-06-28 10:56:41.798460222 +0300 +@@ -55,7 +55,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 +