Accepting request 31593 from home:jengelh:sparc

Copy from home:jengelh:sparc/kbd via accept of submit request 31593 revision 3.
Request was accepted with message:
Reviewed ok

OBS-URL: https://build.opensuse.org/request/show/31593
OBS-URL: https://build.opensuse.org/package/show/Base:System/kbd?expand=0&rev=10

kbd-remove-kbio.diff

@@ -0,0 +1,32 @@
+---
+ 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)
+ {

kbd.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+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
 

kbd.spec

@@ -52,6 +52,7 @@ Patch8:         kbd-1.14.1-sv-latin1-keycode10.patch
 Patch9:         kbd-1.14.1-setfont-no-cruft.patch
 Patch10:        kbd-1.14.1-dumpkeys-C-opt.patch
 Patch11:        kbd-1.14.1-defkeymap.patch
+Patch12:	kbd-remove-kbio.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 PreReq:         %fillup_prereq %insserv_prereq
 BuildRequires:  bison flex
@@ -87,6 +88,7 @@ Authors:
 %patch9 -p1
 %patch10
 %patch11 -p1
+%patch -P 12 -p1
 
 %build
 for i in `find data/keymaps/mac -type f` ; do
@@ -223,7 +225,7 @@ cat %SOURCE6 >> $FILLUP_DIR/sysconfig.keyboard
 %ifnarch %ix86
    rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/resizecons.8*
 %endif
-%ifarch sparc m68k
+%ifarch %sparc m68k
 rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/getkeycodes.8*
 rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/setkeycodes.8*
 %endif
@@ -258,7 +260,7 @@ install -m 755 %SOURCE13 $RPM_BUILD_ROOT/bin/guess_encoding
 /bin/openvt
 /bin/deallocvt
 /bin/dumpkeys
-%ifnarch sparc m68k
+%ifnarch %sparc m68k
 /bin/getkeycodes
 /bin/setkeycodes
 %endif
@@ -286,7 +288,7 @@ install -m 755 %SOURCE13 $RPM_BUILD_ROOT/bin/guess_encoding
 /bin/guess_encoding
 %doc %{_mandir}/man1/*
 %doc %{_mandir}/man5/keymaps.5.gz
-%ifnarch sparc m68k
+%ifnarch %sparc m68k
 %doc %{_mandir}/man8/getkeycodes.8.gz
 %doc %{_mandir}/man8/setkeycodes.8.gz
 %endif