Accepting request 160823 from hardware

- sbl-nostrip.patch: don't strip binaries
- fix changelog formatting (forwarded request 160817 from AndreasSchwab)

OBS-URL: https://build.opensuse.org/request/show/160823
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/sbl?expand=0&rev=34
This commit is contained in:
Stephan Kulow 2013-03-26 11:06:49 +00:00 committed by Git OBS Bridge
commit d279a32056
3 changed files with 83 additions and 43 deletions

33
sbl-nostrip.patch Normal file
View File

@ -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

View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
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
- update license to new format
-------------------------------------------------------------------
Thu Dec 8 11:11:52 UTC 2011 - coolo@suse.com
@ -23,12 +33,14 @@ Thu Sep 3 10:08:01 CEST 2009 - marco@suse.de
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
@ -40,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
@ -67,7 +76,6 @@ 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
@ -84,6 +92,7 @@ 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
@ -101,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
@ -113,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
@ -174,7 +185,7 @@ 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
@ -186,6 +197,7 @@ Sat Nov 3 21:32:03 CET 2007 - marco@suse.de
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
@ -195,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
--------------------------------------------------------------------
@ -216,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
@ -260,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
@ -278,6 +289,7 @@ Mon Mar 15 10:36:44 CET 2004 - marco@suse.de
- 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
@ -286,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
@ -298,7 +309,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
@ -317,7 +327,6 @@ 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
@ -351,7 +360,6 @@ 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
@ -370,7 +378,6 @@ 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
@ -386,8 +393,6 @@ 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
@ -402,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)
@ -476,6 +482,4 @@ Wed Jun 28 00:07:21 CEST 2000 - marco@suse.de
Tue Jun 27 16:47:54 CEST 2000 - marco@suse.de
- dynamic linking
Sat Nov 18 18:24:14 CET 2000
- build shared-libs

View File

@ -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++
@ -25,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
@ -43,7 +45,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
@ -63,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"