Update to kbd-1.15.3
This commit is contained in:
parent
5f43a11930
commit
1338256200
2
.gitignore
vendored
2
.gitignore
vendored
@ -12,3 +12,5 @@ kbd-1.15.tar.gz
|
||||
/kbd-1.15.2.tar.bz2
|
||||
/kbd-1.15.2.tar.bz2.sign
|
||||
/fr-dvorak.tar.bz2
|
||||
/kbd-1.15.3.tar.bz2
|
||||
/kbd-1.15.3.tar.bz2.sign
|
||||
|
@ -1,12 +0,0 @@
|
||||
diff -up kbd-1.15.2/po/Makefile.in.in.orig kbd-1.15.2/po/Makefile.in.in
|
||||
--- kbd-1.15.2/po/Makefile.in.in.orig 2010-04-10 23:34:12.000000000 +0200
|
||||
+++ kbd-1.15.2/po/Makefile.in.in 2011-01-05 12:34:33.182143154 +0100
|
||||
@@ -23,7 +23,7 @@ VPATH = @srcdir@
|
||||
prefix = @prefix@
|
||||
exec_prefix = @exec_prefix@
|
||||
datadir = @datadir@
|
||||
-localedir = $(datadir)/locale
|
||||
+localedir = @localedir@
|
||||
gettextsrcdir = $(datadir)/gettext/po
|
||||
|
||||
INSTALL = @INSTALL@
|
@ -1,15 +1,11 @@
|
||||
diff -up kbd-1.15.2/configure.orig kbd-1.15.2/configure
|
||||
--- kbd-1.15.2/configure.orig 2011-01-05 13:30:25.826147638 +0100
|
||||
+++ kbd-1.15.2/configure 2011-01-05 13:31:15.089526084 +0100
|
||||
@@ -7369,8 +7369,9 @@ fi
|
||||
|
||||
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 ;;
|
||||
- *) RESIZECONS_PROGS=no ;;
|
||||
+ i?86*) RESIZECONS_PROGS=yes ;;
|
||||
i?86*) RESIZECONS_PROGS=yes ;;
|
||||
+ x86_64*) RESIZECONS_PROGS=yes ;;
|
||||
+ *) RESIZECONS_PROGS=no ;;
|
||||
*) RESIZECONS_PROGS=no ;;
|
||||
esac
|
||||
if test "$RESIZECONS_PROGS" = "yes"; then
|
||||
RESIZECONS_PROGS_TRUE=
|
||||
AM_CONDITIONAL(RESIZECONS_PROGS, test "$RESIZECONS_PROGS" = "yes")
|
||||
|
12
kbd-1.15.3-fix-es-translation.patch
Normal file
12
kbd-1.15.3-fix-es-translation.patch
Normal file
@ -0,0 +1,12 @@
|
||||
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
|
46
kbd.spec
46
kbd.spec
@ -1,6 +1,6 @@
|
||||
Name: kbd
|
||||
Version: 1.15.2
|
||||
Release: 3%{?dist}
|
||||
Version: 1.15.3
|
||||
Release: 1%{?dist}
|
||||
Summary: Tools for configuring the console (keyboard, virtual terminals, etc.)
|
||||
|
||||
Group: System Environment/Base
|
||||
@ -12,17 +12,18 @@ Source2: kbd-latsun-fonts.tar.bz2
|
||||
Source3: kbd-latarcyrheb-16-fixed.tar.bz2
|
||||
Source4: fr-dvorak.tar.bz2
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
# Patch0: installs translation file to right place
|
||||
Patch0: kbd-1.15-po.patch
|
||||
# Patch1: puts additional information into man pages
|
||||
Patch1: kbd-1.15-keycodes-man.patch
|
||||
# Patch2: sparc modifications
|
||||
Patch2: kbd-1.15-sparc.patch
|
||||
# Patch3: adds default unicode font to unicode_start script
|
||||
Patch3: kbd-1.15-unicode_start.patch
|
||||
# Patch4: adds resizecon binary also to the x86_64 arch
|
||||
Patch4: kbd-1.15-resizecon-x86_64.patch
|
||||
Patch5: kbd-1.15-defkeymap.patch
|
||||
# Patch0: puts additional information into man pages
|
||||
Patch0: kbd-1.15-keycodes-man.patch
|
||||
# Patch1: sparc modifications
|
||||
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
|
||||
|
||||
BuildRequires: bison, flex, gettext
|
||||
Conflicts: util-linux < 2.11r-9
|
||||
@ -44,12 +45,12 @@ keymaps etc. Please note that %{name}-misc is not helpful without kbd.
|
||||
|
||||
%prep
|
||||
%setup -q -a 2 -a 3 -a 4
|
||||
%patch0 -p1 -b .po
|
||||
%patch1 -p1 -b .keycodes-man
|
||||
%patch2 -p1 -b .sparc
|
||||
%patch3 -p1 -b .unicode_start
|
||||
%patch4 -p1 -b .resizecon_x86_64
|
||||
%patch5 -p1 -b .defkeymap
|
||||
%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
|
||||
|
||||
# 7-bit maps are obsolete; so are non-euro maps
|
||||
pushd data/keymaps/i386
|
||||
@ -111,6 +112,10 @@ sed -i -e 's,\<kbd_mode\>,/bin/kbd_mode,g;s,\<setfont\>,/bin/setfont,g' \
|
||||
# Link open to openvt
|
||||
ln -s openvt $RPM_BUILD_ROOT%{_bindir}/open
|
||||
|
||||
# Move locale files to correct place
|
||||
cp -r $RPM_BUILD_ROOT/lib/kbd/locale/ $RPM_BUILD_ROOT%{_datadir}/locale
|
||||
rm -rf $RPM_BUILD_ROOT/lib/kbd/locale
|
||||
|
||||
%find_lang %{name}
|
||||
|
||||
%clean
|
||||
@ -128,6 +133,9 @@ rm -rf $RPM_BUILD_ROOT
|
||||
/lib/kbd
|
||||
|
||||
%changelog
|
||||
* Mon Aug 22 2011 Vitezslav Crhonek <vcrhonek@redhat.com> - 1.15.3-1
|
||||
- Update to kbd-1.15.3
|
||||
|
||||
* Thu Apr 21 2011 Vitezslav Crhonek <vcrhonek@redhat.com> - 1.15.2-3
|
||||
- Add French Canadian Dvorak keymap
|
||||
Resolves: #680989
|
||||
|
7
sources
7
sources
@ -1,5 +1,2 @@
|
||||
050e1e454e9c01e22f198303d649efb8 kbd-latsun-fonts.tar.bz2
|
||||
884fdbb0b952b2e3e8389a0c40a3e301 kbd-latarcyrheb-16-fixed.tar.bz2
|
||||
e850eb91e4d3b94b194efe8e953204c5 kbd-1.15.2.tar.bz2
|
||||
509b0bce718bf3cb9b631b0a69289751 kbd-1.15.2.tar.bz2.sign
|
||||
dd16ff8c6fa9d81490df28cbd68882eb fr-dvorak.tar.bz2
|
||||
be28c144ba7b3e1cf630f909ae8e9875 kbd-1.15.3.tar.bz2
|
||||
daa94e954bbb40d93d39bd0446e26876 kbd-1.15.3.tar.bz2.sign
|
||||
|
Loading…
Reference in New Issue
Block a user