Update to kbd-1.15.5
This commit is contained in:
Vitezslav Crhonek
parent
73252467e1
commit
8ff85b5765
1
.gitignore
vendored
1
.gitignore
vendored
@ -16,3 +16,4 @@ kbd-1.15.tar.gz
|
||||
/kbd-1.15.3.tar.bz2.sign
|
||||
/kbd-latarcyrheb-32.tar.bz2
|
||||
/kbd-1.15.3.tar.gz
|
||||
/kbd-1.15.5.tar.gz
|
||||
|
||||
@ -1,12 +0,0 @@
|
||||
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
|
||||
|
||||
@ -1,11 +0,0 @@
|
||||
diff -up kbd-1.15.3/configure.ac.orig kbd-1.15.3/configure.ac
|
||||
--- kbd-1.15.3/configure.ac.orig 2011-08-22 16:01:11.456165128 +0200
|
||||
+++ kbd-1.15.3/configure.ac 2011-08-22 16:01:38.878163675 +0200
|
||||
@@ -60,6 +60,7 @@ AM_CONDITIONAL(KEYCODES_PROGS, test "$KE
|
||||
|
||||
case $host_cpu in
|
||||
i?86*) RESIZECONS_PROGS=yes ;;
|
||||
+ x86_64*) RESIZECONS_PROGS=yes ;;
|
||||
*) RESIZECONS_PROGS=no ;;
|
||||
esac
|
||||
AM_CONDITIONAL(RESIZECONS_PROGS, test "$RESIZECONS_PROGS" = "yes")
|
||||
@ -1,12 +0,0 @@
|
||||
diff -up kbd-1.15.3/po/es.po.orig kbd-1.15.3/po/es.po
|
||||
--- kbd-1.15.3/po/es.po.orig 2011-08-22 15:18:35.262343023 +0200
|
||||
+++ kbd-1.15.3/po/es.po 2011-08-22 15:19:14.844340262 +0200
|
||||
@@ -1363,7 +1363,7 @@ msgstr "No se encontró nada que guardar
|
||||
#: 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"
|
||||
+msgstr "Se ha guardado el fichero de tipos %dx%d de %d caracteres en %s\n"
|
||||
|
||||
#: src/setkeycodes.c:21
|
||||
#, c-format
|
||||
@ -1,20 +0,0 @@
|
||||
diff -up kbd-1.15.3/src/loadkeys.c.orig kbd-1.15.3/src/loadkeys.c
|
||||
--- kbd-1.15.3/src/loadkeys.c.orig 2011-10-24 13:44:52.222401546 +0200
|
||||
+++ kbd-1.15.3/src/loadkeys.c 2011-10-24 13:47:52.413389029 +0200
|
||||
@@ -2958,7 +2958,7 @@ int main(int argc, char *argv[])
|
||||
close(fd);
|
||||
}
|
||||
|
||||
- for (i = optind; argv[i]; i++) {
|
||||
+ for (i = optind; argv[i] || optd; i++) {
|
||||
FILE *f;
|
||||
char *ev;
|
||||
|
||||
@@ -2974,6 +2974,7 @@ int main(int argc, char *argv[])
|
||||
if (optd) {
|
||||
/* first read default map - search starts in . */
|
||||
optd = 0;
|
||||
+ i--;
|
||||
if ((f = findfile(DEFMAP, dirpath, suffixes)) == NULL) {
|
||||
fprintf(stderr, _("Cannot find %s\n"), DEFMAP);
|
||||
exit(EXIT_FAILURE);
|
||||
29
kbd.spec
29
kbd.spec
@ -1,6 +1,6 @@
|
||||
Name: kbd
|
||||
Version: 1.15.3
|
||||
Release: 8%{?dist}
|
||||
Version: 1.15.5
|
||||
Release: 1%{?dist}
|
||||
Summary: Tools for configuring the console (keyboard, virtual terminals, etc.)
|
||||
|
||||
Group: System Environment/Base
|
||||
@ -17,18 +17,10 @@ Patch0: kbd-1.15-keycodes-man.patch
|
||||
Patch1: kbd-1.15-sparc.patch
|
||||
# Patch2: adds default unicode font to unicode_start script
|
||||
Patch2: kbd-1.15-unicode_start.patch
|
||||
# Patch3: adds resizecon binary also to the x86_64 arch
|
||||
Patch3: kbd-1.15-resizecon-x86_64.patch
|
||||
# Patch4: default keymap in Fedora uses a little bit different name...
|
||||
Patch4: kbd-1.15-defkeymap.patch
|
||||
# Patch5: fix of tranlation file broken after new tarball release
|
||||
Patch5: kbd-1.15.3-fix-es-translation.patch
|
||||
# Patch6: add missing dumpkeys option to man page
|
||||
Patch6: kbd-1.15.3-dumpkeys-man.patch
|
||||
# Patch7: already accepted by upstream
|
||||
Patch7: kbd-1.15.3-loadkeys-d.patch
|
||||
# Patch3: add missing dumpkeys option to man page
|
||||
Patch3: kbd-1.15.3-dumpkeys-man.patch
|
||||
|
||||
BuildRequires: bison, flex, gettext
|
||||
BuildRequires: bison, flex, gettext, pam-devel
|
||||
Requires: initscripts >= 5.86-1
|
||||
Requires: %{name}-misc = %{version}-%{release}
|
||||
|
||||
@ -50,11 +42,7 @@ keymaps etc. Please note that %{name}-misc is not helpful without kbd.
|
||||
%patch0 -p1 -b .keycodes-man
|
||||
%patch1 -p1 -b .sparc
|
||||
%patch2 -p1 -b .unicode_start
|
||||
%patch3 -p1 -b .resizecon_x86_64
|
||||
%patch4 -p1 -b .defkeymap
|
||||
%patch5 -p1 -b .fix-es-fixtranslation
|
||||
%patch6 -p1 -b .dumpkeys-man
|
||||
%patch7 -p1 -b .loadkeys-d
|
||||
%patch3 -p1 -b .dumpkeys-man
|
||||
|
||||
# 7-bit maps are obsolete; so are non-euro maps
|
||||
pushd data/keymaps/i386
|
||||
@ -131,6 +119,11 @@ rm -rf $RPM_BUILD_ROOT/lib/kbd/locale
|
||||
/lib/kbd
|
||||
|
||||
%changelog
|
||||
* Wed Jan 09 2013 Vitezslav Crhonek <vcrhonek@redhat.com> - 1.15.5-1
|
||||
- Update to kbd-1.15.5 (removed kbd-1.15-resizecon-x86_64.patch,
|
||||
kbd-1.15-defkeymap.patch, kbd-1.15.3-fix-es-translation.patch,
|
||||
kbd-1.15.3-loadkeys-d.patch)
|
||||
|
||||
* Thu Sep 13 2012 Vitezslav Crhonek <vcrhonek@redhat.com> - 1.15.3-8
|
||||
- Fix link to upstream tarball
|
||||
|
||||
|
||||
2
sources
2
sources
@ -2,4 +2,4 @@
|
||||
884fdbb0b952b2e3e8389a0c40a3e301 kbd-latarcyrheb-16-fixed.tar.bz2
|
||||
dd16ff8c6fa9d81490df28cbd68882eb fr-dvorak.tar.bz2
|
||||
fe118f07a83134b15610503e5e3fe10e kbd-latarcyrheb-32.tar.bz2
|
||||
8143e179a0f3c25646ce5085e8777200 kbd-1.15.3.tar.gz
|
||||
34c71feead8ab9c01ec638acea8cd877 kbd-1.15.5.tar.gz
|
||||
|
||||
Loading…
Reference in New Issue
Block a user