rpm/kbd
SHA256
1
0
Fork 0
forked from pool/kbd
Code Pull Requests Activity

Accepting request 97286 from home:sbrabec:branches:Base:System

Browse Source 
- Enable resizecons on x86_64 (bnc#737631).

OBS-URL: https://build.opensuse.org/request/show/97286
OBS-URL: https://build.opensuse.org/package/show/Base:System/kbd?expand=0&rev=40
This commit is contained in:
Stanislav Brabec 2011-12-20 16:54:05 +00:00 committed by Git OBS Bridge
parent 7d918c88a5
commit 4ccdbdc4e1
3 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
kbd-1.15.3-resizecons-enable-x86_64.patch Normal file
View File

@ -0,0 +1,13 @@
Index: kbd-1.15.3/configure.ac
===================================================================
--- kbd-1.15.3.orig/configure.ac
+++ kbd-1.15.3/configure.ac
@@ -59,7 +59,7 @@ esac
AM_CONDITIONAL(KEYCODES_PROGS, test "$KEYCODES_PROGS" = "yes")
case $host_cpu in
- i?86*) RESIZECONS_PROGS=yes ;;
+ i?86*|x86_64) RESIZECONS_PROGS=yes ;;
*) RESIZECONS_PROGS=no ;;
esac
AM_CONDITIONAL(RESIZECONS_PROGS, test "$RESIZECONS_PROGS" = "yes")

5
kbd.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Dec 20 17:35:35 CET 2011 - sbrabec@suse.cz
- Enable resizecons on x86_64 (bnc#737631).
-------------------------------------------------------------------
Wed Nov 30 14:24:18 UTC 2011 - coolo@suse.com

12
kbd.spec
View File

@ -15,6 +15,8 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
Name: kbd
# git: git://git.altlinux.org/people/legion/packages/kbd.git
Url: ftp://ftp.altlinux.org/pub/people/legion/kbd/
@ -54,6 +56,7 @@ Patch7: kbd-1.15.2-defkeymap.patch
Patch8: kbd-1.15.2-chvt-userwait.patch
Patch9: kbd-%{version}-po-es.patch
Patch10: kbd-1.15.3-loadkeys.diff
Patch11: kbd-1.15.3-resizecons-enable-x86_64.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
PreReq: %fillup_prereq %insserv_prereq
BuildRequires: bison
@ -90,6 +93,7 @@ Authors:
%patch8 -p1
%patch9 -p1
%patch10 -p1
%patch11 -p1
%build
for i in `find data/keymaps/mac -type f` ; do
@ -227,8 +231,10 @@ cat %SOURCE6 >> $FILLUP_DIR/sysconfig.keyboard
#mkdir -p $RPM_BUILD_ROOT/etc/sysconfig
#touch $RPM_BUILD_ROOT/etc/sysconfig/console
%ifnarch %ix86
%ifnarch x86_64
rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/resizecons.8*
%endif
%endif
%ifarch %sparc m68k
rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/getkeycodes.8*
rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/setkeycodes.8*
@ -281,6 +287,9 @@ install -m 755 %SOURCE13 $RPM_BUILD_ROOT/bin/guess_encoding
%ifarch %ix86
/bin/resizecons
%endif
%ifarch x86_64
/bin/resizecons
%endif
/bin/setfont
/bin/setleds
/bin/setmetamode
@ -313,6 +322,9 @@ install -m 755 %SOURCE13 $RPM_BUILD_ROOT/bin/guess_encoding
%ifarch %ix86
%doc %{_mandir}/man8/resizecons.8.gz
%endif
%ifarch x86_64
%doc %{_mandir}/man8/resizecons.8.gz
%endif
%doc %{_mandir}/man8/setfont.8.gz
%doc %{_mandir}/man8/fbtest.8.gz
%doc %{_mandir}/man8/kbdrate.8.gz