From c2f3e976053186c7e610a5154bc89cf448e556654fd3a6ad2d3e6f9b94285d2e Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Sun, 7 Feb 2010 13:43:21 +0000 Subject: [PATCH 1/3] 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 | 32 ++++++++++++++++++++++++++++++++ kbd.changes | 6 ++++++ kbd.spec | 8 +++++--- 3 files changed, 43 insertions(+), 3 deletions(-) create mode 100644 kbd-remove-kbio.diff diff --git a/kbd-remove-kbio.diff b/kbd-remove-kbio.diff new file mode 100644 index 0000000..edff585 --- /dev/null +++ b/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 +-#include + #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 +-#endif +- + static void + usage(void) + { diff --git a/kbd.changes b/kbd.changes index 7d88b68..18ff279 100644 --- a/kbd.changes +++ b/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 diff --git a/kbd.spec b/kbd.spec index 7ffd3dd..a7af1c9 100644 --- a/kbd.spec +++ b/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 From c5cfc624f0311983db2a8dc7017223747e48294446613d2861559794696ed70e Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Thu, 11 Feb 2010 19:42:26 +0000 Subject: [PATCH 2/3] checked in (request 31700) OBS-URL: https://build.opensuse.org/package/show/Base:System/kbd?expand=0&rev=11 --- kbd-remove-kbio.diff | 32 -------------------------------- kbd.changes | 6 ------ kbd.spec | 8 +++----- 3 files changed, 3 insertions(+), 43 deletions(-) delete mode 100644 kbd-remove-kbio.diff diff --git a/kbd-remove-kbio.diff b/kbd-remove-kbio.diff deleted file mode 100644 index edff585..0000000 --- a/kbd-remove-kbio.diff +++ /dev/null @@ -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 --#include - #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 --#endif -- - static void - usage(void) - { diff --git a/kbd.changes b/kbd.changes index 18ff279..7d88b68 100644 --- a/kbd.changes +++ b/kbd.changes @@ -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 diff --git a/kbd.spec b/kbd.spec index a7af1c9..7ffd3dd 100644 --- a/kbd.spec +++ b/kbd.spec @@ -52,7 +52,6 @@ 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 @@ -88,7 +87,6 @@ Authors: %patch9 -p1 %patch10 %patch11 -p1 -%patch -P 12 -p1 %build for i in `find data/keymaps/mac -type f` ; do @@ -225,7 +223,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 @@ -260,7 +258,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 @@ -288,7 +286,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 From a300d8a6404f0ae7d9d4995572481ee9291a7dd877edef726d0055d37fcea57d Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Thu, 11 Feb 2010 19:42:27 +0000 Subject: [PATCH 3/3] Updating link to change in openSUSE:Factory/kbd revision 33.0 OBS-URL: https://build.opensuse.org/package/show/Base:System/kbd?expand=0&rev=ae90407d073c1acbbe451b4edaf5e4f8 --- kbd-remove-kbio.diff | 32 ++++++++++++++++++++++++++++++++ kbd.changes | 6 ++++++ kbd.spec | 10 ++++++---- 3 files changed, 44 insertions(+), 4 deletions(-) create mode 100644 kbd-remove-kbio.diff diff --git a/kbd-remove-kbio.diff b/kbd-remove-kbio.diff new file mode 100644 index 0000000..edff585 --- /dev/null +++ b/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 +-#include + #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 +-#endif +- + static void + usage(void) + { diff --git a/kbd.changes b/kbd.changes index 7d88b68..18ff279 100644 --- a/kbd.changes +++ b/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 diff --git a/kbd.spec b/kbd.spec index 7ffd3dd..7d6077d 100644 --- a/kbd.spec +++ b/kbd.spec @@ -24,7 +24,7 @@ License: GPLv2+ Group: System/Console AutoReqProv: on Version: 1.14.1 -Release: 21 +Release: 22 Summary: Keyboard and Font Utilities Source: kbd-%{version}.tar.bz2 Source1: kbd_fonts.tar.bz2 @@ -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