diff --git a/kbd-1.15-defkeymap.patch b/kbd-1.15-defkeymap.patch new file mode 100644 index 0000000..5e604b7 --- /dev/null +++ b/kbd-1.15-defkeymap.patch @@ -0,0 +1,12 @@ +diff -up kbd-1.15/src/paths.h.orig kbd-1.15/src/paths.h +--- kbd-1.15/src/paths.h.orig 2010-06-07 15:26:21.787315778 +0200 ++++ kbd-1.15/src/paths.h 2010-06-07 15:26:49.353336391 +0200 +@@ -19,7 +19,7 @@ + # define DEFMAP "sunkeymap.kmap" + # define KERNDIR "/usr/src/linux/drivers/sbus/char" + #else +-# define DEFMAP "defkeymap.kmap" ++# define DEFMAP "defkeymap.map" + # define KERNDIR "/usr/src/linux/drivers/char" + #endif + diff --git a/kbd.spec b/kbd.spec index a48ae85..735dc94 100644 --- a/kbd.spec +++ b/kbd.spec @@ -1,6 +1,6 @@ Name: kbd Version: 1.15 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Tools for configuring the console (keyboard, virtual terminals, etc.) Group: System Environment/Base @@ -17,6 +17,7 @@ Patch2: kbd-1.15-sparc.patch Patch3: kbd-1.15-unicode_start.patch Patch4: kbd-1.15-resizecon-x86_64.patch Patch5: kbd-1.15-quiet_doc.patch +Patch6: kbd-1.15-defkeymap.patch BuildRequires: bison, flex, gettext Conflicts: util-linux < 2.11r-9 @@ -35,6 +36,7 @@ fonts, the virtual terminals and font files. %patch3 -p1 -b .unicode_start %patch4 -p1 -b .resizecon_x86_64 %patch5 -p1 -b .quiet_doc +%patch6 -p1 -b .defkeymap # 7-bit maps are obsolete; so are non-euro maps pushd data/keymaps/i386 @@ -105,6 +107,9 @@ rm -rf $RPM_BUILD_ROOT /lib/kbd %changelog +* Mon Jun 14 2010 Vitezslav Crhonek - 1.15-10 +- Fix name referring to default keymap + * Wed Aug 26 2009 Karsten Hopp 1.15-9 - drop excludearch s390x, we need this package to be able to build other packages on s390x