checked in (request 31700)
OBS-URL: https://build.opensuse.org/package/show/Base:System/kbd?expand=0&rev=11
This commit is contained in:
parent
1278e0fdfc
commit
a81db4de44
@ -1,32 +0,0 @@
|
|||||||
---
|
|
||||||
src/kbdrate.c | 1 -
|
|
||||||
src/setleds.c | 4 ----
|
|
||||||
2 files changed, 5 deletions(-)
|
|
||||||
|
|
||||||
Index: kbd-1.14.1/src/kbdrate.c
|
|
||||||
===================================================================
|
|
||||||
--- kbd-1.14.1.orig/src/kbdrate.c
|
|
||||||
+++ kbd-1.14.1/src/kbdrate.c
|
|
||||||
@@ -77,7 +77,6 @@ beats rebuilding the kernel!
|
|
||||||
|
|
||||||
#ifdef __sparc__
|
|
||||||
#include <asm/param.h>
|
|
||||||
-#include <asm/kbio.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef KDKBDREP
|
|
||||||
Index: kbd-1.14.1/src/setleds.c
|
|
||||||
===================================================================
|
|
||||||
--- kbd-1.14.1.orig/src/setleds.c
|
|
||||||
+++ kbd-1.14.1/src/setleds.c
|
|
||||||
@@ -14,10 +14,6 @@
|
|
||||||
#include "nls.h"
|
|
||||||
#include "version.h"
|
|
||||||
|
|
||||||
-#ifdef __sparc__
|
|
||||||
-#include <asm/kbio.h>
|
|
||||||
-#endif
|
|
||||||
-
|
|
||||||
static void
|
|
||||||
usage(void)
|
|
||||||
{
|
|
@ -1,9 +1,3 @@
|
|||||||
-------------------------------------------------------------------
|
|
||||||
Thu Feb 4 12:22:49 UTC 2010 - jengelh@medozas.de
|
|
||||||
|
|
||||||
- remove inclusion of kbio.h on SPARC, this has been removed
|
|
||||||
in the kernel
|
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Sun Jan 10 01:45:25 UTC 2010 - jw@novell.com
|
Sun Jan 10 01:45:25 UTC 2010 - jw@novell.com
|
||||||
|
|
||||||
|
8
kbd.spec
8
kbd.spec
@ -52,7 +52,6 @@ Patch8: kbd-1.14.1-sv-latin1-keycode10.patch
|
|||||||
Patch9: kbd-1.14.1-setfont-no-cruft.patch
|
Patch9: kbd-1.14.1-setfont-no-cruft.patch
|
||||||
Patch10: kbd-1.14.1-dumpkeys-C-opt.patch
|
Patch10: kbd-1.14.1-dumpkeys-C-opt.patch
|
||||||
Patch11: kbd-1.14.1-defkeymap.patch
|
Patch11: kbd-1.14.1-defkeymap.patch
|
||||||
Patch12: kbd-remove-kbio.diff
|
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
PreReq: %fillup_prereq %insserv_prereq
|
PreReq: %fillup_prereq %insserv_prereq
|
||||||
BuildRequires: bison flex
|
BuildRequires: bison flex
|
||||||
@ -88,7 +87,6 @@ Authors:
|
|||||||
%patch9 -p1
|
%patch9 -p1
|
||||||
%patch10
|
%patch10
|
||||||
%patch11 -p1
|
%patch11 -p1
|
||||||
%patch -P 12 -p1
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
for i in `find data/keymaps/mac -type f` ; do
|
for i in `find data/keymaps/mac -type f` ; do
|
||||||
@ -225,7 +223,7 @@ cat %SOURCE6 >> $FILLUP_DIR/sysconfig.keyboard
|
|||||||
%ifnarch %ix86
|
%ifnarch %ix86
|
||||||
rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/resizecons.8*
|
rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/resizecons.8*
|
||||||
%endif
|
%endif
|
||||||
%ifarch %sparc m68k
|
%ifarch sparc m68k
|
||||||
rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/getkeycodes.8*
|
rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/getkeycodes.8*
|
||||||
rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/setkeycodes.8*
|
rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/setkeycodes.8*
|
||||||
%endif
|
%endif
|
||||||
@ -260,7 +258,7 @@ install -m 755 %SOURCE13 $RPM_BUILD_ROOT/bin/guess_encoding
|
|||||||
/bin/openvt
|
/bin/openvt
|
||||||
/bin/deallocvt
|
/bin/deallocvt
|
||||||
/bin/dumpkeys
|
/bin/dumpkeys
|
||||||
%ifnarch %sparc m68k
|
%ifnarch sparc m68k
|
||||||
/bin/getkeycodes
|
/bin/getkeycodes
|
||||||
/bin/setkeycodes
|
/bin/setkeycodes
|
||||||
%endif
|
%endif
|
||||||
@ -288,7 +286,7 @@ install -m 755 %SOURCE13 $RPM_BUILD_ROOT/bin/guess_encoding
|
|||||||
/bin/guess_encoding
|
/bin/guess_encoding
|
||||||
%doc %{_mandir}/man1/*
|
%doc %{_mandir}/man1/*
|
||||||
%doc %{_mandir}/man5/keymaps.5.gz
|
%doc %{_mandir}/man5/keymaps.5.gz
|
||||||
%ifnarch %sparc m68k
|
%ifnarch sparc m68k
|
||||||
%doc %{_mandir}/man8/getkeycodes.8.gz
|
%doc %{_mandir}/man8/getkeycodes.8.gz
|
||||||
%doc %{_mandir}/man8/setkeycodes.8.gz
|
%doc %{_mandir}/man8/setkeycodes.8.gz
|
||||||
%endif
|
%endif
|
||||||
|
Loading…
Reference in New Issue
Block a user