[packages/kbd] - updated to 1.15.5 - removed obsolete defkeymap,po,resizecon-x86_64 patches - new vlock utility as
qboosh
qboosh at pld-linux.org
Sat Dec 15 22:27:25 CET 2012
commit 3e2ffac09ad439b8c128490401502d3572b0fddc
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sat Dec 15 22:28:24 2012 +0100
- updated to 1.15.5
- removed obsolete defkeymap,po,resizecon-x86_64 patches
- new vlock utility as subpackage (it fully obsoletes vlock v1, but not v2)
kbd-defkeymap.patch | 11 -----------
kbd-ngettext.patch | 37 +++++++++++++++----------------------
kbd-po.patch | 11 -----------
kbd.spec | 47 ++++++++++++++++++++++++++++++++++++-----------
resizecon-x86_64.patch | 11 -----------
5 files changed, 51 insertions(+), 66 deletions(-)
---
diff --git a/kbd.spec b/kbd.spec
index 7e75e0e..1921595 100644
--- a/kbd.spec
+++ b/kbd.spec
@@ -1,15 +1,22 @@
-# TODO
+# NOTE: kbd's vlock is a fork of vlock v1.x
+# comparing with vlock v2.x it has NLS, but no plugins support
+# TODO:
+# - pam file for vlock
# - probably it doesn't make sense to package ppc keymaps on x86 and vice versa
+#
+# Conditional build:
+%bcond_without vlock # don't build vlock
+#
Summary: Linux console utilities
Summary(ko.UTF-8): 콘솔을 설정하는 도구 (글쇠판, 가상 터미널, 그 밖에)
Summary(pl.UTF-8): Narzędzia do obsługi konsoli
Name: kbd
-Version: 1.15.3
-Release: 6
+Version: 1.15.5
+Release: 1
License: GPL v2+
Group: Applications/Console
Source0: ftp://ftp.altlinux.org/pub/people/legion/kbd/%{name}-%{version}.tar.gz
-# Source0-md5: 8143e179a0f3c25646ce5085e8777200
+# Source0-md5: 34c71feead8ab9c01ec638acea8cd877
Source1: %{name}.init
Source2: %{name}.sysconfig
Source3: http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
@@ -32,15 +39,13 @@ Source12: console.upstart
Patch0: %{name}-unicode_start.patch
Patch1: %{name}-ngettext.patch
Patch2: %{name}-tty-detect.patch
-Patch3: %{name}-defkeymap.patch
-Patch4: %{name}-po.patch
-Patch5: resizecon-x86_64.patch
URL: http://www.win.tue.nl/~aeb/linux/
BuildRequires: autoconf >= 2.60
BuildRequires: automake >= 1:1.9
BuildRequires: bison
BuildRequires: flex
BuildRequires: gettext-devel >= 0.14.1
+%{?with_vlock:BuildRequires: pam-devel}
Requires(post,preun): /sbin/chkconfig
Requires: open
Requires: rc-scripts >= 0.4.3.0
@@ -64,14 +69,24 @@ maps. It also includes a number of different fonts and keyboard maps.
Pakiet zawiera narzędzia do ładowania fontów konsolowych oraz map
klawiatury. Dodatkowo dołączono znaczną liczbę różnych fontów i map.
+%package vlock
+Summary: Utility to lock one or more virtual consoles
+Summary(pl.UTF-8): Narzędzie do blokowania jednej lub wielu konsol wirtualnych
+Group: Applications/Console
+Requires: %{name} = %{version}-%{release}
+Obsoletes: vlock
+
+%description vlock
+Utility to lock one or more virtual consoles.
+
+%description vlock -l pl.UTF-8
+Narzędzie do blokowania jednej lub wielu konsol wirtualnych.
+
%prep
%setup -q -a51 -a52
%patch0 -p1
%patch1 -p1
%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
%build
%{__gettextize}
@@ -82,7 +97,9 @@ klawiatury. Dodatkowo dołączono znaczną liczbę różnych fontów i map.
%configure \
--datadir=%{_ldatadir} \
--localedir=%{_datadir}/locale \
- --enable-nls
+ --enable-nls \
+ --disable-silent-rules \
+ %{!?with_vlock:--disable-vlock}
%{__make}
%install
@@ -213,3 +230,11 @@ fi
%lang(hu) %{_mandir}/hu/man[158]/*
%lang(ko) %{_mandir}/ko/man[158]/*
%lang(pl) %{_mandir}/pl/man[158]/*
+
+%if %{with vlock}
+%files vlock
+%defattr(644,root,root,755)
+%doc src/vlock/README.vlock
+%attr(755,root,root) %{_bindir}/vlock
+%{_mandir}/man1/vlock.1*
+%endif
diff --git a/kbd-defkeymap.patch b/kbd-defkeymap.patch
deleted file mode 100644
index e8e3ea2..0000000
--- a/kbd-defkeymap.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kbd-1.15/src/paths.h~ 2008-03-13 18:46:23.000000000 +0200
-+++ kbd-1.15/src/paths.h 2010-03-15 16:07:43.213588671 +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-ngettext.patch b/kbd-ngettext.patch
index 8c173db..c1adbf9 100644
--- a/kbd-ngettext.patch
+++ b/kbd-ngettext.patch
@@ -21,8 +21,8 @@
}
} else if (verbose) {
---- kbd-1.15.3/po/pl.po.orig 2011-05-14 23:07:50.000000000 +0200
-+++ kbd-1.15.3/po/pl.po 2011-05-26 20:54:15.239593047 +0200
+--- kbd-1.15.5/po/pl.po.orig 2012-12-03 07:35:17.000000000 +0100
++++ kbd-1.15.5/po/pl.po 2012-12-15 22:02:26.542184855 +0100
@@ -14,6 +14,7 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-2\n"
@@ -31,12 +31,12 @@
#: src/chvt.c:28
#, c-format
-@@ -620,45 +621,39 @@
+@@ -623,37 +624,39 @@
msgid "impossible error in do_constant"
msgstr "niemo�liwy b��d w do_constant"
-# XXX: ngettext should be used for the following five messages
- #: loadkeys.y:585
+ #: loadkeys.y:596
#, c-format
msgid ""
"\n"
@@ -44,23 +44,23 @@
-msgstr ""
+"Changed %d key"
+msgid_plural ""
-+"\n"
-+"Changed %d keys"
-+msgstr[0] ""
"\n"
-"Zmienionych klawiszy: %d%s �a�cuch�w: %d%s\n"
-
--#: loadkeys.y:586
+-#: loadkeys.y:597
-msgid "key"
-msgstr ","
-
--#: loadkeys.y:586
+-#: loadkeys.y:597
-msgid "keys"
-msgstr ","
-
--#: loadkeys.y:587
+-#: loadkeys.y:598
-msgid "string"
-msgstr "."
++"Changed %d keys"
++msgstr[0] ""
++"\n"
+"Zmieniono %d klawisz"
+msgstr[1] ""
+"\n"
@@ -69,9 +69,10 @@
+"\n"
+"Zmieniono %d klawiszy"
- #: loadkeys.y:587
+-#: loadkeys.y:598
-msgid "strings"
-msgstr "."
++#: loadkeys.y:596
+#, c-format
+msgid " and %d string.\n"
+msgid_plural " and %d strings.\n"
@@ -80,23 +81,15 @@
+msgstr[2] " i %d �a�cuch�w.\n"
-# XXX: ngettext should be used for the following three messages
- #: loadkeys.y:594
+ #: loadkeys.y:605
#, c-format
-msgid "Loaded %d compose %s.\n"
-msgstr "Wczytanych definicji compose: %d%s\n"
--
--#: loadkeys.y:595
--msgid "definition"
--msgstr "."
--
--#: loadkeys.y:595
--msgid "definitions"
--msgstr "."
+msgid "Loaded %d compose definition.\n"
+msgid_plural "Loaded %d compose definitions.\n"
+msgstr[0] "Wczytano %d definicj� compose.\n"
+msgstr[1] "Wczytano %d definicje compose.\n"
+msgstr[2] "Wczytano %d definicji compose.\n"
- #: loadkeys.y:599
- #, c-format
+ #: loadkeys.y:606
+ msgid "definition"
diff --git a/kbd-po.patch b/kbd-po.patch
deleted file mode 100644
index 942a5cd..0000000
--- a/kbd-po.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kbd-1.15.3/po/es.po.orig 2011-05-14 23:12:49.000000000 +0200
-+++ kbd-1.15.3/po/es.po 2011-05-26 21:36:19.173010892 +0200
-@@ -1363,7 +1363,7 @@
- #: 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 %2$dx%3$d de %1$d caracteres en %4$s\n"
-
- #: src/setkeycodes.c:21
- #, c-format
diff --git a/resizecon-x86_64.patch b/resizecon-x86_64.patch
deleted file mode 100644
index 3ce5a68..0000000
--- a/resizecon-x86_64.patch
+++ /dev/null
@@ -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")
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kbd.git/commitdiff/3e2ffac09ad439b8c128490401502d3572b0fddc
More information about the pld-cvs-commit
mailing list