rpm/sbl
SHA256
1
0
Fork 0
forked from pool/sbl
Code Pull Requests Activity

Accepting request 307373 from home:lmuelle:el80c

Browse Source 
Credits to Tim Ehlers and Michael Binder of GWDG for reporting,
testing, and enhancement of the fix.

Thanks to Dr. Werner Fink for the hints in bsc#931036 and pointing
to the misspelled sppkdev in the dpcumentation.

The package changes are:

- Use sppkdev instead of spkdev in the documentation too.
  + sbl-sppkdev.patch
- Add --nodaemon option to ExecStart of the brld.service and set Type=forking
  of the sbl.service both in the service section; (bsc#931036).

- Install missing brld init script and rc sym link.
  + sbl-init-scripts.patch
- Conditionally patch LIBDIR location to satisfy bi-arch requirements.
  + sbl-libdir.patch
- Create git7a75bc29 snaptshot tar ball.

OBS-URL: https://build.opensuse.org/request/show/307373
OBS-URL: https://build.opensuse.org/package/show/hardware/sbl?expand=0&rev=23
This commit is contained in:
Stefan Seyfried 2015-05-30 13:37:59 +00:00 committed by Git OBS Bridge
parent b9b72d0824
commit c7f79869c0
11 changed files with 100 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
brld.service
View File

@ -4,7 +4,7 @@ Wants=network.target
After=network.target After=network.target
[Service] [Service]
ExecStart=/usr/sbin/brld ExecStart=/usr/sbin/brld --nodaemon
[Install] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target

3
sbl-3.5.0.20130317.git7a75bc29.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3dcaa96ec4b76cfa4a472b9055f35042ecde9f33bc0d9aa858d2f511559ef1de
size 177642

3
sbl-3.5.0.tbz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e9dd6d2ef2df5efc92297dfbc2d13de097aae453597810669d31042e793e507b
size 204418

16
sbl-init-scripts.patch Normal file
View File

@ -0,0 +1,16 @@
Author: Tim Ehlers <tehlers@gwdg.de>
Subject: Traditional init script and rc sym link for brld are missing
Index: sbl-3.5.0.20130317.git7a75bc29/brld/Makefile
===================================================================
--- sbl-3.5.0.20130317.git7a75bc29.orig/brld/Makefile
+++ sbl-3.5.0.20130317.git7a75bc29/brld/Makefile
@@ -40,6 +40,8 @@ install: brld $(LIBNAME)
ln -s $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(LINKNAME)
install --directory $(DESTDIR)$(MANDIR)/man8
install ../man/brld.8 $(DESTDIR)$(MANDIR)/man8
+ install -m 744 ../config/brld $(DESTDIR)$(CONFDIR)/init.d
+ ln -sf $(CONFDIR)/init.d/brld $(DESTDIR)$(PREFIX)/sbin/rcbrld
uninstall:
$(RM) $(DESTDIR)$(SBINDIR)/brld

13
sbl-install_perms.patch
View File

@ -1,16 +1,3 @@
--- brld/Makefile
+++ brld/Makefile
@@ -39,8 +39,8 @@
install: $(PRG) $(LIBNAME)
install --directory $(DESTDIR)$(INSTPATH)
- install -m 744 $(PRG) $(DESTDIR)$(INSTPATH)
- install -m 744 ../config/brld $(DESTDIR)$(CONFDIR)/init.d
+ install -m 755 $(PRG) $(DESTDIR)$(INSTPATH)
+ install -m 755 ../config/brld $(DESTDIR)$(CONFDIR)/init.d
ln -sf $(CONFDIR)/init.d/brld $(DESTDIR)$(PREFIX)/sbin/rcbrld
install --directory $(DESTDIR)$(LIBINSTPATH)
install -m 755 $(LIBNAME).$(SOVER) $(DESTDIR)$(LIBINSTPATH)
--- sbl/Makefile --- sbl/Makefile
+++ sbl/Makefile +++ sbl/Makefile
@@ -22,7 +22,7 @@ @@ -22,7 +22,7 @@

18
sbl-libdir.patch Normal file
View File

@ -0,0 +1,18 @@
Author: Tim Ehlers <tehlers@gwdg.de>
Subject: Add lib64 to the LIBDIR
This patch gets only applied if _libdir == /usr/lib64
Index: sbl-3.5.0.20130317.git7a75bc29/make.config
===================================================================
--- sbl-3.5.0.20130317.git7a75bc29.orig/make.config
+++ sbl-3.5.0.20130317.git7a75bc29/make.config
@@ -3,7 +3,7 @@
CONFDIR=/etc
PREFIX=/usr
-LIBDIR=$(PREFIX)/lib
+LIBDIR=$(PREFIX)/lib64
SBINDIR=$(PREFIX)/sbin
PROGPATH=$(PREFIX)/lib/sbl
MANDIR=$(PREFIX)/share/man

18
sbl-nostrip.patch
View File

@ -1,21 +1,3 @@
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 Index: sbl/Makefile
=================================================================== ===================================================================
--- sbl/Makefile.orig --- sbl/Makefile.orig

30
sbl-sppkdev.patch Normal file
View File

@ -0,0 +1,30 @@
Author: Lars Mueller <lmuelle@suse.com>
Subject: Use sppkdev instead of spkdev in the documentation too.
Reported-by: Dr. Werner Fink <werner@suse.com>
Index: sbl-3.5.0.20130317.git7a75bc29/man/sbl.8
===================================================================
--- sbl-3.5.0.20130317.git7a75bc29.orig/man/sbl.8
+++ sbl-3.5.0.20130317.git7a75bc29/man/sbl.8
@@ -8,7 +8,7 @@ the user can configure the prefered outp
-c --config - config file (default /etc/sbl.conf)
-a --auth - authkey for brld (default default)
-p --port - brld port - if port is 0 use brld.sock (default 0)
- -d --spkdev - device for hardware speech-synths
+ -d --sppkdev - device for hardware speech-synths
-s --speech - speech synth (default none)
-k --kbdport - kbdsniffd port - if 0 kbdsniffd.sock is used (default 0)
-l --log enable logging to /tmp/sbl.log
Index: sbl-3.5.0.20130317.git7a75bc29/sbl/config.h
===================================================================
--- sbl-3.5.0.20130317.git7a75bc29.orig/sbl/config.h
+++ sbl-3.5.0.20130317.git7a75bc29/sbl/config.h
@@ -9,7 +9,7 @@
-a --auth - authkey for brld (default default) \n \
-p --port - brld port - if port is 0 use brld.sock (default 0) \n \
-s --speech - speech synth (default none) \n \
- -d --spkdev - device for hardware speech-synths \n \
+ -d --sppkdev - device for hardware speech-synths \n \
-k --kbdport - kbdsniffd port - if 0 kbdsniffd.sock is used (default 0) \n \
-i --kbdid - ID string for kbdsniffd (default default) \n \
-l --log - enable debug and log to /tmp/sbl.log \n \

23
sbl.changes
View File

@ -1,17 +1,34 @@
-------------------------------------------------------------------
Fri May 15 14:02:26 UTC 2015 - lmuelle@suse.com
- Use sppkdev instead of spkdev in the documentation too.
+ sbl-sppkdev.patch
- Add --nodaemon option to ExecStart of the brld.service and set Type=forking
of the sbl.service both in the service section; (bsc#931036).
-------------------------------------------------------------------
Wed May 13 23:19:16 UTC 2015 - lmuelle@suse.com
- Install missing brld init script and rc sym link.
+ sbl-init-scripts.patch
- Conditionally patch LIBDIR location to satisfy bi-arch requirements.
+ sbl-libdir.patch
- Create git7a75bc29 snaptshot tar ball.
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Sep 11 13:53:54 CEST 2014 - ro@suse.de Thu Sep 11 13:53:54 CEST 2014 - ro@suse.de
- install binaries with mode 0755 not 0744 (bnc#851625) - install binaries with mode 0755 not 0744 (bnc#851625)
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Sep 5 14:46:52 CEST 2014 - ro@suse.de Fri Sep 5 14:46:52 CEST 2014 - ro@suse.de
- add systemd support (bnc#865857) - add systemd support (bnc#865857)
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Aug 14 08:24:34 UTC 2014 - tyang@suse.com Thu Aug 14 08:24:34 UTC 2014 - tyang@suse.com
- Get rid of files using the old SUSE spelling (bnc#889007). - Get rid of files using the old SUSE spelling (bnc#889007).
------------------------------------------------------------------- -------------------------------------------------------------------
Fri May 31 08:32:58 UTC 2013 - mhrusecky@suse.com Fri May 31 08:32:58 UTC 2013 - mhrusecky@suse.com

1
sbl.service
View File

@ -4,6 +4,7 @@ Wants=network.target brld.service
After=network.target brld.service After=network.target brld.service
[Service] [Service]
Type=forking
ExecStart=/usr/sbin/sbl ExecStart=/usr/sbin/sbl
[Install] [Install]

26
sbl.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package sbl # spec file for package sbl
# #
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -26,14 +26,16 @@ BuildRequires: speechd-devel
BuildRequires: pkgconfig(libsystemd-daemon) BuildRequires: pkgconfig(libsystemd-daemon)
%{?systemd_requires} %{?systemd_requires}
%endif %endif
Version: 3.5.0 Version: 3.5.0.20130317.git7a75bc29
Release: 0 Release: 0
Source: sbl-3.5.0.tbz2 Source: sbl-%{version}.tar.bz2
Source1: sbl.service Source1: sbl.service
Source2: brld.service Source2: brld.service
Patch1: sbl-shared.patch Patch1: sbl-shared.patch
Patch2: sbl-nostrip.patch Patch2: sbl-nostrip.patch
Patch3: sbl-install_perms.patch Patch3: sbl-install_perms.patch
Patch4: sbl-libdir.patch
Patch5: sbl-init-scripts.patch
Summary: SUSE blinux Summary: SUSE blinux
License: GPL-2.0+ License: GPL-2.0+
Group: Hardware/Other Group: Hardware/Other
@ -45,11 +47,6 @@ SUSE blinux is a screen reader for the Linux console. It supports
braille displays. braille displays.
Authors:
--------
marco@suse.de
%package orca %package orca
Summary: brld-orca brlapi Summary: brld-orca brlapi
License: GPL-2.0 and GPL-2.0+ License: GPL-2.0 and GPL-2.0+
@ -63,22 +60,21 @@ Requires: orca
%description orca %description orca
this python module enables orca to use brld for braille output this python module enables orca to use brld for braille output
Authors:
--------
Marco Skambraks
Halim Sahin
%prep %prep
%setup -q %setup -q
%patch1 -p0 %patch1 -p0
%patch2 -p0 %patch2 -p0
%patch3 %patch3
%if "%{_libdir}" == "/usr/lib64"
%patch4 -p1
%endif
%patch5 -p1
%build %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 -I%_includedir/speech-dispatcher" 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 -I%_includedir/speech-dispatcher"
%install %install
make LIBINSTPATH=%{_libdir} DESTDIR=$RPM_BUILD_ROOT install make LIBINSTPATH=%{_libdir} DESTDIR=$RPM_BUILD_ROOT install
%if %{suse_version} > 1310 %if %{suse_version} > 1310
rm -f $RPM_BUILD_ROOT/etc/init.d/sbl rm -f $RPM_BUILD_ROOT/etc/init.d/sbl
@ -139,7 +135,7 @@ rm -rf $RPM_BUILD_ROOT
/usr/sbin/rcsbl /usr/sbin/rcsbl
/usr/sbin/brld /usr/sbin/brld
/usr/sbin/rcbrld /usr/sbin/rcbrld
%{_libdir}/libbrld.so.1 %{_libdir}/libbrld.so*
%if %{suse_version} > 1310 %if %{suse_version} > 1310
%{_unitdir}/sbl.service %{_unitdir}/sbl.service
%{_unitdir}/brld.service %{_unitdir}/brld.service