- Don't install resizecons.8 on non-x86 (#186877, patch by Keiichi Mori
<kmori@redhat.com>)
This commit is contained in:
parent
59fc0a4ca4
commit
e2c102870f
20
kbd-1.12-resizecon-man.patch
Normal file
20
kbd-1.12-resizecon-man.patch
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
Patch by Keiichi Mori <kmori@redhat.com>.
|
||||||
|
|
||||||
|
--- kbd-1.12/man/Makefile.orig 2002-10-12 07:12:53.000000000 +0900
|
||||||
|
+++ kbd-1.12/man/Makefile 2006-03-27 09:17:54.000000000 +0900
|
||||||
|
@@ -1,3 +1,5 @@
|
||||||
|
+include ../make_include
|
||||||
|
+
|
||||||
|
# Generated files
|
||||||
|
GEN1=man1/dumpkeys.1 man1/loadkeys.1
|
||||||
|
GEN8=man8/setfont.8 man8/loadunimap.8 man8/mapscrn.8
|
||||||
|
@@ -8,6 +10,9 @@
|
||||||
|
install -m 644 $$i/*.[0-9] $(MANDIR)/$$i; \
|
||||||
|
done
|
||||||
|
rm -f $(MANDIR)/man5/keytables.5
|
||||||
|
+ if [ $(ARCH) != i386 ]; then \
|
||||||
|
+ rm -f $(MANDIR)/man8/resizecons.8; \
|
||||||
|
+ fi
|
||||||
|
|
||||||
|
clean:
|
||||||
|
rm -f $(GEN1) $(GEN8)
|
8
kbd.spec
8
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: 13.2
|
Release: 14
|
||||||
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
|
||||||
@ -21,6 +21,7 @@ Patch6: kbd-1.12-nostrip.patch
|
|||||||
Patch7: kbd-1.12-alias.patch
|
Patch7: kbd-1.12-alias.patch
|
||||||
Patch8: kbd-1.12-dir.patch
|
Patch8: kbd-1.12-dir.patch
|
||||||
Patch9: kbd-1.12-no-user-map.patch
|
Patch9: kbd-1.12-no-user-map.patch
|
||||||
|
Patch10: kbd-1.12-resizecon-man.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
|
||||||
@ -45,6 +46,7 @@ fonts, the virtual terminals and font files.
|
|||||||
%patch7 -p1 -b .alias
|
%patch7 -p1 -b .alias
|
||||||
%patch8 -p1 -b .dir
|
%patch8 -p1 -b .dir
|
||||||
%patch9 -p1 -b .no-user-map
|
%patch9 -p1 -b .no-user-map
|
||||||
|
%patch10 -p1 -b .resizecon-man
|
||||||
|
|
||||||
# 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
|
||||||
@ -121,6 +123,10 @@ install -c -m644 %{SOURCE3} \
|
|||||||
%config %{_sysconfdir}/pam.d/*
|
%config %{_sysconfdir}/pam.d/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Mar 27 2006 Miloslav Trmac <mitr@redhat.com> - 1.12-14
|
||||||
|
- Don't install resizecons.8 on non-x86 (#186877, patch by Keiichi Mori
|
||||||
|
<kmori@redhat.com>)
|
||||||
|
|
||||||
* Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 1.12-13.2
|
* Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 1.12-13.2
|
||||||
- bump again for double-long bug on ppc(64)
|
- bump again for double-long bug on ppc(64)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user