From a8607733243b642e08dd4549ad4009c682e7828acea7f5a143303524f063ef6c Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Sat, 2 Mar 2013 11:25:14 +0000 Subject: [PATCH 1/2] Accepting request 156920 from openSUSE:Factory:Staging:spdx update license to new format OBS-URL: https://build.opensuse.org/request/show/156920 OBS-URL: https://build.opensuse.org/package/show/hardware/sbl?expand=0&rev=13 --- sbl.changes | 5 +++++ sbl.spec | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/sbl.changes b/sbl.changes index 474046d..87643c7 100644 --- a/sbl.changes +++ b/sbl.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Mar 1 06:38:43 UTC 2013 - coolo@suse.com + +- update license to new format + ------------------------------------------------------------------- Thu Dec 8 11:11:52 UTC 2011 - coolo@suse.com diff --git a/sbl.spec b/sbl.spec index 3d641bb..3342bf8 100644 --- a/sbl.spec +++ b/sbl.spec @@ -1,7 +1,7 @@ # # spec file for package sbl # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: sbl BuildRequires: bluez-devel BuildRequires: gcc-c++ @@ -43,7 +44,7 @@ Authors: %package orca Summary: brld-orca brlapi -License: GPL-2.0 ; GPL-2.0+ +License: GPL-2.0 and GPL-2.0+ Group: Productivity/Multimedia/Sound/Utilities Requires: orca %py_requires From 7c85f67a5d3889391f8a2a579f949146ce8346ac23f2c43f41e63dfff1c5c7f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Sun, 24 Mar 2013 20:41:34 +0000 Subject: [PATCH 2/2] Accepting request 160817 from home:AndreasSchwab:ff - sbl-nostrip.patch: don't strip binaries - fix changelog formatting OBS-URL: https://build.opensuse.org/request/show/160817 OBS-URL: https://build.opensuse.org/package/show/hardware/sbl?expand=0&rev=14 --- sbl-nostrip.patch | 33 +++++++++++++++++++ sbl.changes | 81 +++++++++++++++++++++++------------------------ sbl.spec | 2 ++ 3 files changed, 75 insertions(+), 41 deletions(-) create mode 100644 sbl-nostrip.patch diff --git a/sbl-nostrip.patch b/sbl-nostrip.patch new file mode 100644 index 0000000..c5742f4 --- /dev/null +++ b/sbl-nostrip.patch @@ -0,0 +1,33 @@ +Index: brld/Makefile +=================================================================== +--- brld/Makefile.orig ++++ brld/Makefile +@@ -39,11 +39,11 @@ clean: + + install: $(PRG) $(LIBNAME) + install --directory $(DESTDIR)$(INSTPATH) +- install -s -m 744 $(PRG) $(DESTDIR)$(INSTPATH) ++ install -m 744 $(PRG) $(DESTDIR)$(INSTPATH) + install -m 744 ../config/brld $(DESTDIR)$(CONFDIR)/init.d + ln -sf $(CONFDIR)/init.d/brld $(DESTDIR)$(PREFIX)/sbin/rcbrld + install --directory $(DESTDIR)$(LIBINSTPATH) +- install -s -m 755 $(LIBNAME).$(SOVER) $(DESTDIR)$(LIBINSTPATH) ++ install -m 755 $(LIBNAME).$(SOVER) $(DESTDIR)$(LIBINSTPATH) + install --directory $(DESTDIR)$(MANDIR)/man8 + install -m 755 ../man/brld.8 $(DESTDIR)$(MANDIR)/man8 + +Index: sbl/Makefile +=================================================================== +--- sbl/Makefile.orig ++++ sbl/Makefile +@@ -62,8 +62,8 @@ install: sbl + install --directory $(DESTDIR)$(CONFDIR)/sbl/brltbl + install --directory $(DESTDIR)$(CONFDIR)/sbl/keymap + install --directory $(DESTDIR)$(PREFIX)/sbin +- install -s sbl $(DESTDIR)$(PREFIX)/sbin +- install -s lib/* $(DESTDIR)$(SBLPATH)/lib ++ install sbl $(DESTDIR)$(PREFIX)/sbin ++ install lib/* $(DESTDIR)$(SBLPATH)/lib + install -m 644 ../profile/* $(DESTDIR)$(CONFDIR)/sbl/profile + install -m 644 ../keymap/* $(DESTDIR)$(CONFDIR)/sbl/keymap + install -m 644 ../spk/* $(DESTDIR)$(CONFDIR)/sbl/spk diff --git a/sbl.changes b/sbl.changes index 87643c7..9d41b54 100644 --- a/sbl.changes +++ b/sbl.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Mar 24 16:01:37 UTC 2013 - schwab@linux-m68k.org + +- sbl-nostrip.patch: don't strip binaries + ------------------------------------------------------------------- Fri Mar 1 06:38:43 UTC 2013 - coolo@suse.com @@ -18,26 +23,28 @@ Wed Oct 7 20:18:16 UTC 2009 - aj@suse.de Tue Sep 29 12:44:43 CEST 2009 - marco@suse.de - updated to correct changelog - + -------------------------------------------------------------------- Thu Sep 3 10:08:01 CEST 2009 - marco@suse.de - fixed problem with alvausb - + -------------------------------------------------------------------- Wed Aug 19 00:59:02 CEST 2009 - marco@suse.de - sbl.spec - added correct python path + -------------------------------------------------------------------- Tue Aug 18 23:20:12 CEST 2009 - marco@suse.de - updated to version 3.5.0 - added sbl-orca package for orca braille support with brld + ------------------------------------------------------------------- Fri Nov 28 16:39:07 CET 2008 - ro@suse.de -- use -fPIC also in CFLAGS to fix build on x86_64 +- use -fPIC also in CFLAGS to fix build on x86_64 ------------------------------------------------------------------- Tue Nov 18 13:36:30 CET 2008 - marco@suse.de @@ -45,15 +52,12 @@ Tue Nov 18 13:36:30 CET 2008 - marco@suse.de - added new orca settings - fixed the brlwav driver problem - ------------------------------------------------------------------- Thu Oct 23 06:52:04 CEST 2008 - marco@suse.de - fixed an error in the a11y init script (braille=1 not set) bug#437723 - using -z instead of comparing the strings - - ------------------------------------------------------------------- Mon Oct 20 16:39:35 CEST 2008 - marco@suse.de @@ -72,16 +76,15 @@ Wed Oct 8 17:11:00 CEST 2008 - marco@suse.de - added a11y script temporarily - will make an own package "a11y" later - ------------------------------------------------------------------- Mon Sep 29 14:01:50 CEST 2008 - ro@suse.de -- drop manual requires for libusb +- drop manual requires for libusb ------------------------------------------------------------------- Mon Sep 29 14:00:24 CEST 2008 - marco@suse.de -- fix typo in brld.c +- fix typo in brld.c -------------------------------------------------------------------- Fri Sep 26 17:00:57 CEST 2008 - marco@suse.de @@ -89,13 +92,14 @@ Fri Sep 26 17:00:57 CEST 2008 - marco@suse.de - change suse-init-scripts brld and sbl - brld will only start if brlname is not none - sbl will only start if brlname is not none and/or spkname is not none + -------------------------------------------------------------------- Thu Sep 11 04:29:07 CEST 2008 - marco@suse.de - added further speech-cursor functions spkwordlft, spkwordrgt, spkstop - spkcsrxy added TTY number -- brld and drivers +- brld and drivers added experimental USB support - added experimental alvausb support for alva sat540 (brlname=alvausb) - added some errorhandling (brld) @@ -106,6 +110,7 @@ Thu Aug 14 09:22:32 CEST 2008 - marco@suse.de - removed orca_sbl - added orca-patch (orca-brld-patch.diff + -------------------------------------------------------------------- Thu Aug 14 09:01:16 CEST 2008 - marco@suse.de @@ -118,6 +123,7 @@ Thu Aug 14 09:01:16 CEST 2008 - marco@suse.de - brld - added attribute-underline for orca - some code cleanup - brld - fixed a possible iconv problem (orca) + -------------------------------------------------------------------- Sat Apr 26 14:32:40 CEST 2008 - marco@suse.de @@ -179,18 +185,19 @@ Tue Jan 29 17:10:13 CET 2008 - marco@suse.de - modified/updated the brlstar80 keymap - added reconnect in sbl if libbrld reports "NOCONNECT" - renamed /etc/init.d/suse-blinux to /etc/init.d/sbl -- + -------------------------------------------------------------------- Sat Nov 3 21:32:03 CET 2007 - marco@suse.de - improved process-detection -- the foreground-process is now detected even if the +- the foreground-process is now detected even if the - current process has not the highest PID -------------------------------------------------------------------- Wed Oct 24 13:48:45 CEST 2007 - marco@suse.de - added support for handytech evolution 88 and 64 + -------------------------------------------------------------------- Mon Jul 23 12:40:32 CEST 2007 - marco@suse.de @@ -200,6 +207,7 @@ Mon Jul 23 12:40:32 CEST 2007 - marco@suse.de -------------------------------------------------------------------- Tue Jul 17 15:49:24 CEST 2007 - marco@suse.de + - first release of brld -------------------------------------------------------------------- @@ -221,7 +229,6 @@ Fri Mar 2 13:06:32 CET 2007 - marco@suse.de - added patch from ssommer@suse.de - changed screen device from /dev/vcsa0 to /dev/vcsa -- ------------------------------------------------------------------- Mon Jan 22 12:19:49 CET 2007 - ssommer@suse.de @@ -265,7 +272,6 @@ Wed Mar 24 12:49:20 CET 2004 - marco@suse.de - added portability patch from schwab@suse.de - ------------------------------------------------------------------- Wed Mar 17 10:42:33 CET 2004 - schwab@suse.de @@ -275,14 +281,15 @@ Wed Mar 17 10:42:33 CET 2004 - schwab@suse.de ------------------------------------------------------------------- Mon Mar 15 19:48:32 CET 2004 - marco@suse.de -- fixed ia64 errors in softspeech_server.c +- fixed ia64 errors in softspeech_server.c ------------------------------------------------------------------- Mon Mar 15 10:36:44 CET 2004 - marco@suse.de -- fixed FB bug resolutions > 800x600 now OK +- fixed FB bug resolutions > 800x600 now OK - disabled mbrdico support for this version (2.2) - added new softspeech-lib + ------------------------------------------------------------------- Tue Mar 9 17:40:32 CET 2004 - marco@suse.de @@ -291,7 +298,6 @@ Tue Mar 9 17:40:32 CET 2004 - marco@suse.de - improve speech-only navigation (kernel patch needed) - added brllino support (experimental) - ------------------------------------------------------------------- Sun Mar 7 23:00:30 CET 2004 - ro@suse.de @@ -302,7 +308,6 @@ Mon Aug 11 13:41:32 CEST 2003 - marco@suse.de - add power-braille-support (experimental) - add mbrdico support in softspeech_server - ------------------------------------------------------------------- Thu Jun 5 14:15:11 CEST 2003 - coolo@suse.de @@ -314,26 +319,25 @@ Thu Jun 5 14:15:11 CEST 2003 - coolo@suse.de ------------------------------------------------------------------- Thu Sep 12 23:44:23 CEST 2002 - marco@suse.de -- removed lib-mn and lib-blazi +- removed lib-mn and lib-blazi ------------------------------------------------------------------- Tue Sep 10 17:17:37 CEST 2002 - marco@suse.de - added profiles y2base and y2menu - removed include of rc.config in suse-blinux script - ------------------------------------------------------------------- Tue Aug 20 11:11:56 CEST 2002 - ro@suse.de -- added prereq (#17984) +- added prereq (#17984) ------------------------------------------------------------------- Thu Jul 25 17:54:38 CEST 2002 - marco@suse.de - add brlwave features - fixed bug in startscript -- modified spkfilter for multi-language-support +- modified spkfilter for multi-language-support ------------------------------------------------------------------- Fri Jun 14 00:07:15 CEST 2002 - ro@suse.de @@ -348,21 +352,20 @@ Thu Mar 21 15:42:28 MET 2002 - mmj@suse.de ------------------------------------------------------------------- Sun Feb 10 19:49:52 CET 2002 - marco@suse.de -- add brlstar40-support +- add brlstar40-support ------------------------------------------------------------------- Thu Jan 31 15:03:19 CET 2002 - marco@suse.de - cleaned up the profile and keymap directory - fixed the lnrgt bug - ------------------------------------------------------------------- Tue Jan 29 19:15:38 CET 2002 - marco@suse.de - add patch from schwab@suse.de - add string-compression for speech -- add a new handling of screen-memory (for frame-buffer) +- add a new handling of screen-memory (for frame-buffer) ------------------------------------------------------------------- Wed Jan 23 16:57:11 CET 2002 - schwab@suse.de @@ -374,30 +377,27 @@ Tue Jan 15 09:47:21 CET 2002 - marco@suse.de - moved fifos from /tmp to /var/run - using a new version of softspeech.so - ------------------------------------------------------------------- Mon Sep 17 14:31:15 CEST 2001 - marco@suse.de -- fixed bug in startup-script (status) +- fixed bug in startup-script (status) ------------------------------------------------------------------- Thu Sep 6 16:44:30 CEST 2001 - marco@suse.de -- add check before using fifos +- add check before using fifos ------------------------------------------------------------------- Wed Aug 15 15:32:00 CEST 2001 - marco@suse.de - add patch from ro@suse.de (use g++ instead of gcc for linking) - - ------------------------------------------------------------------- Mon Aug 13 19:57:03 CEST 2001 - marco@suse.de - add patch from schwab@suse.de -- add new documentation +- add new documentation ------------------------------------------------------------------- Mon Aug 13 17:20:36 CEST 2001 - schwab@suse.de @@ -407,6 +407,7 @@ Mon Aug 13 17:20:36 CEST 2001 - schwab@suse.de ------------------------------------------------------------------- Mon Aug 13 14:53:28 CEST 2001 - marco@suse.de + - add combibraille-support (25,40,80) - fix tiny bug - fix handytech bug (statuscells) @@ -433,17 +434,17 @@ Sat May 5 23:26:45 CEST 2001 - schwab@suse.de ------------------------------------------------------------------- Mon Apr 30 14:46:41 CEST 2001 - marco@suse.de -- update to 1.2 +- update to 1.2 ------------------------------------------------------------------- Tue Dec 12 17:50:13 CET 2000 - marco@suse.de -- integrated patches +- integrated patches ------------------------------------------------------------------- Thu Nov 30 00:05:47 CET 2000 - ro@suse.de -- fixed start-script to install in /etc/init.d +- fixed start-script to install in /etc/init.d - use doc macro in specfile ------------------------------------------------------------------- @@ -454,33 +455,31 @@ Wed Nov 29 23:58:37 CET 2000 - ro@suse.de ------------------------------------------------------------------- Sat Nov 18 18:23:17 CET 2000 - marco@suse.de -- update to 1.1 +- update to 1.1 ------------------------------------------------------------------- Thu Jun 29 11:04:06 CEST 2000 - marco@suse.de - suse-blinux.conf - profile2 is now y2bignfat (for yast2 textmode inst) -: keymaps - prof1,prof2 +: keymaps - prof1,prof2 ------------------------------------------------------------------- Wed Jun 28 19:28:18 CEST 2000 - marco@suse.de -- change yast2-profile (frame-buffer) +- change yast2-profile (frame-buffer) ------------------------------------------------------------------- Wed Jun 28 08:47:15 CEST 2000 - marco@suse.de -- bug-fix in profile-directory +- bug-fix in profile-directory ------------------------------------------------------------------- Wed Jun 28 00:07:21 CEST 2000 - marco@suse.de -- new profile for yast2 +- new profile for yast2 ------------------------------------------------------------------- Tue Jun 27 16:47:54 CEST 2000 - marco@suse.de - dynamic linking -Sat Nov 18 18:24:14 CET 2000 - build shared-libs - diff --git a/sbl.spec b/sbl.spec index 3342bf8..68dce53 100644 --- a/sbl.spec +++ b/sbl.spec @@ -26,6 +26,7 @@ Version: 3.5.0 Release: 0 Source: sbl-3.5.0.tbz2 Patch1: sbl-shared.patch +Patch2: sbl-nostrip.patch Summary: SuSE blinux License: GPL-2.0+ Group: Hardware/Other @@ -64,6 +65,7 @@ Authors: %prep %setup -n sbl-3.5.0 %patch1 -p0 +%patch2 -p0 %build make CFLAGS="$RPM_OPT_FLAGS -D_POSIX_C_SOURCE=2 -D_BSD_SOURCE" LIB_CFLAGS="$RPM_OPT_FLAGS -D_POSIX_C_SOURCE=2 -D_BSD_SOURCE -fPIC"