- Don't ship a patch backup file
- Mention in setfont.8 that 512-glyph fonts reduce the number of available colors (#140935, patch by Dmitry Butskoj) - Remove "Meta_acute" from German keymaps (#143124) - Make the %%triggerun script condition more precise, ignore failure of the script
This commit is contained in:
parent
d7825d620f
commit
ca7068c7d8
14
kbd-1.12-setfont-man.patch
Normal file
14
kbd-1.12-setfont-man.patch
Normal file
@ -0,0 +1,14 @@
|
|||||||
|
diff -Nrbu kbd-1.12/man/man8/setfont.8.in kbd-1.12-OK/man/man8/setfont.8.in
|
||||||
|
--- kbd-1.12/man/man8/setfont.8.in 2004-01-03 07:15:59.000000000 +0300
|
||||||
|
+++ kbd-1.12-OK/man/man8/setfont.8.in 2004-11-26 19:20:15.000000000 +0300
|
||||||
|
@@ -50,6 +50,10 @@
|
||||||
|
Load a given font (here a 512-glyph font combining several
|
||||||
|
character sets) and indicate that one's local character set
|
||||||
|
is ISO 8859-2.
|
||||||
|
+.LP
|
||||||
|
+Note: if a font has more than 256 glyphs, only 8 out of 16 colors
|
||||||
|
+can be used simultaneously. It can make console perception worse
|
||||||
|
+(loss of intensity and even some colors).
|
||||||
|
|
||||||
|
.SH "FONT FORMATS"
|
||||||
|
The standard Linux font format is the PSF font.
|
27
kbd.spec
27
kbd.spec
@ -1,7 +1,7 @@
|
|||||||
Summary: Tools for configuring the console (keyboard, virtual terminals, etc.)
|
Summary: Tools for configuring the console (keyboard, virtual terminals, etc.)
|
||||||
Name: kbd
|
Name: kbd
|
||||||
Version: 1.12
|
Version: 1.12
|
||||||
Release: 3
|
Release: 4
|
||||||
License: GPL
|
License: GPL
|
||||||
Group: System Environment/Base
|
Group: System Environment/Base
|
||||||
Source0: ftp://ftp.kernel.org/pub/linux/utils/kbd/kbd-%{version}.tar.bz2
|
Source0: ftp://ftp.kernel.org/pub/linux/utils/kbd/kbd-%{version}.tar.bz2
|
||||||
@ -14,8 +14,10 @@ Requires: pam >= 0.66-4, /etc/pam.d/system-auth, usermode
|
|||||||
BuildRoot: %{_tmppath}/%{name}-root
|
BuildRoot: %{_tmppath}/%{name}-root
|
||||||
Patch0: kbd-1.08-sparc.patch
|
Patch0: kbd-1.08-sparc.patch
|
||||||
Patch1: kbd-1.08-compose.patch
|
Patch1: kbd-1.08-compose.patch
|
||||||
Patch4: kbd-1.08-terminal.patch
|
Patch2: kbd-1.08-terminal.patch
|
||||||
Patch7: kbd-1.08-rukbd.patch
|
Patch3: kbd-1.08-rukbd.patch
|
||||||
|
Patch4: kbd-1.12-setfont-man.patch
|
||||||
|
Patch5: kbd-1.12-Meta_acute.patch
|
||||||
Obsoletes: console-tools
|
Obsoletes: console-tools
|
||||||
Provides: console-tools
|
Provides: console-tools
|
||||||
Conflicts: util-linux < 2.11r-9
|
Conflicts: util-linux < 2.11r-9
|
||||||
@ -32,8 +34,10 @@ fonts, the virtual terminals and font files.
|
|||||||
%setup -q -a 5
|
%setup -q -a 5
|
||||||
%patch0 -p1 -b .sparc
|
%patch0 -p1 -b .sparc
|
||||||
%patch1 -p1
|
%patch1 -p1
|
||||||
%patch4 -p1 -b .terminal
|
%patch2 -p1 -b .terminal
|
||||||
%patch7 -p1 -b .utf8ru
|
%patch3 -p1 -b .utf8ru
|
||||||
|
%patch4 -p1 -b .man
|
||||||
|
%patch5 -p1 -b .Meta_acute
|
||||||
|
|
||||||
# 7-bit maps are obsolete; so are non-euro maps
|
# 7-bit maps are obsolete; so are non-euro maps
|
||||||
pushd data/keymaps/i386
|
pushd data/keymaps/i386
|
||||||
@ -57,6 +61,7 @@ export OLD_PO_FILE_INPUT=yes
|
|||||||
# We don't want the backups to show up on an actually installed system
|
# We don't want the backups to show up on an actually installed system
|
||||||
# (But we want them after an rpm -bp kbd.spec, so don't remove -b)
|
# (But we want them after an rpm -bp kbd.spec, so don't remove -b)
|
||||||
find . -name "*.p[0-9]" |xargs rm -f
|
find . -name "*.p[0-9]" |xargs rm -f
|
||||||
|
rm data/keymaps/i386/qwerty/ru.map.utf8ru
|
||||||
|
|
||||||
# We don't use % {configure} because the ./configure included here does not
|
# We don't use % {configure} because the ./configure included here does not
|
||||||
# understand most of the options.
|
# understand most of the options.
|
||||||
@ -105,8 +110,8 @@ install -c -m644 $RPM_SOURCE_DIR/kbdrate.pam \
|
|||||||
|
|
||||||
%postun -p /sbin/ldconfig
|
%postun -p /sbin/ldconfig
|
||||||
|
|
||||||
%triggerun -- kbd < 1.08-11
|
%triggerun -- kbd < 1.08-10.2
|
||||||
/sbin/chkconfig --del keytable
|
/sbin/chkconfig --del keytable || :
|
||||||
|
|
||||||
%files -f %{name}.lang
|
%files -f %{name}.lang
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
@ -120,6 +125,14 @@ install -c -m644 $RPM_SOURCE_DIR/kbdrate.pam \
|
|||||||
%config %{_sysconfdir}/pam.d/*
|
%config %{_sysconfdir}/pam.d/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sat Feb 19 2005 Miloslav Trmac <mitr@redhat.com> - 1.12-4
|
||||||
|
- Don't ship a patch backup file
|
||||||
|
- Mention in setfont.8 that 512-glyph fonts reduce the number of available
|
||||||
|
colors (#140935, patch by Dmitry Butskoj)
|
||||||
|
- Remove "Meta_acute" from German keymaps (#143124)
|
||||||
|
- Make the %%triggerun script condition more precise, ignore failure of the
|
||||||
|
script
|
||||||
|
|
||||||
* Mon Feb 14 2005 Adrian Havill <havill@redhat.com>
|
* Mon Feb 14 2005 Adrian Havill <havill@redhat.com>
|
||||||
- rebuilt
|
- rebuilt
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user