Hello community,
here is the log from the commit of package sbl for openSUSE:Factory checked in
at 2015-06-16 14:04:49
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/sbl (Old)
and /work/SRC/openSUSE:Factory/.sbl.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sbl"
Changes:
--------
--- /work/SRC/openSUSE:Factory/sbl/sbl.changes 2014-09-08 21:28:22.000000000
+0200
+++ /work/SRC/openSUSE:Factory/.sbl.new/sbl.changes 2015-06-16
14:04:51.000000000 +0200
@@ -1,0 +2,35 @@
+Sat Jun 13 11:49:56 UTC 2015 - mplus...@suse.com
+
+- Cleanup spec file with spec-clener
+- Apply sbl-sppkdev.patch
+- Update rcservice symlinks
+
+-------------------------------------------------------------------
+Wed Jun 10 07:48:22 UTC 2015 - mplus...@suse.com
+
+- Update changelog to mention new patch (sbl-install_perms.patch)
+
+-------------------------------------------------------------------
+Fri May 15 14:02:26 UTC 2015 - lmue...@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 - lmue...@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 - r...@suse.de
+
+- install binaries with mode 0755 not 0744 (bnc#851625)
+ * sbl-install_perms.patch
+
+-------------------------------------------------------------------
Old:
----
sbl-3.5.0.tbz2
New:
----
sbl-3.5.0.20130317.git7a75bc29.tar.bz2
sbl-init-scripts.patch
sbl-install_perms.patch
sbl-libdir.patch
sbl-sppkdev.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ sbl.spec ++++++
--- /var/tmp/diff_new_pack.z3qKhl/_old 2015-06-16 14:04:52.000000000 +0200
+++ /var/tmp/diff_new_pack.z3qKhl/_new 2015-06-16 14:04:52.000000000 +0200
@@ -1,7 +1,7 @@
#
# 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
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,82 +17,79 @@
Name: sbl
+Version: 3.5.0.20130317.git7a75bc29
+Release: 0
+Summary: SUSE blinux
+License: GPL-2.0+
+Group: Hardware/Other
+Source: sbl-%{version}.tar.bz2
+Source1: sbl.service
+Source2: brld.service
+Patch1: sbl-shared.patch
+Patch2: sbl-nostrip.patch
+Patch3: sbl-install_perms.patch
+Patch4: sbl-libdir.patch
+Patch5: sbl-init-scripts.patch
+Patch6: sbl-sppkdev.patch
BuildRequires: bluez-devel
BuildRequires: gcc-c++
BuildRequires: libusb-devel
BuildRequires: orca
BuildRequires: speechd-devel
-%if %{suse_version} > 1310
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+%if 0%{?suse_version} > 1310
BuildRequires: pkgconfig(libsystemd-daemon)
%{?systemd_requires}
+%else
+Requires(post): %insserv_prereq
+Requires(postun): %insserv_prereq
%endif
-Version: 3.5.0
-Release: 0
-Source: sbl-3.5.0.tbz2
-Source1: sbl.service
-Source2: brld.service
-Patch1: sbl-shared.patch
-Patch2: sbl-nostrip.patch
-Summary: SUSE blinux
-License: GPL-2.0+
-Group: Hardware/Other
-PreReq: %insserv_prereq
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
SUSE blinux is a screen reader for the Linux console. It supports
braille displays.
-
-
-Authors:
---------
- ma...@suse.de
-
%package orca
+%if 0%{?suse_version} <= 1110
+%define python_sitearch %{py_sitedir}
+%endif
Summary: brld-orca brlapi
License: GPL-2.0 and GPL-2.0+
Group: Productivity/Multimedia/Sound/Utilities
Requires: orca
%py_requires
-%if %suse_version <= 1110
-%define python_sitearch %{py_sitedir}
-%endif
%description orca
this python module enables orca to use brld for braille output
-Authors:
---------
- Marco Skambraks
- Halim Sahin
-
-
%prep
%setup -q
-%patch1 -p0
-%patch2 -p0
+%patch1
+%patch2
+%patch3
+%if "%{_lib}" == "lib64"
+%patch4 -p1
+%endif
+%patch5 -p1
+%patch6 -p1
%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 %{?_smp_mflags} CFLAGS="%{optflags} -D_POSIX_C_SOURCE=2 -D_BSD_SOURCE"
LIB_CFLAGS="%{optflags} -D_POSIX_C_SOURCE=2 -D_BSD_SOURCE -fPIC
-I%{_includedir}/speech-dispatcher"
%install
-make LIBINSTPATH=%{_libdir} DESTDIR=$RPM_BUILD_ROOT install
-%if %{suse_version} > 1310
-rm -f $RPM_BUILD_ROOT/etc/init.d/sbl
-rm -f $RPM_BUILD_ROOT/etc/init.d/brld
-install -D -m 644 %SOURCE1 %{buildroot}%{_unitdir}/sbl.service
-install -D -m 644 %SOURCE2 %{buildroot}%{_unitdir}/brld.service
-rm -f $RPM_BUILD_ROOT/usr/sbin/rcsbl
-rm -f $RPM_BUILD_ROOT/usr/sbin/rcbrld
-ln -sf /sbin/service $RPM_BUILD_ROOT/usr/sbin/rcsbl
-ln -sf /sbin/service $RPM_BUILD_ROOT/usr/sbin/rcbrld
+make LIBINSTPATH=%{_libdir} DESTDIR=%{buildroot} install
+%if 0%{?suse_version} > 1310
+rm -f %{buildroot}%{_initddir}/sbl
+rm -f %{buildroot}%{_initddir}/brld
+install -D -m 644 %{SOURCE1} %{buildroot}%{_unitdir}/sbl.service
+install -D -m 644 %{SOURCE2} %{buildroot}%{_unitdir}/brld.service
+rm -f %{buildroot}%{_sbindir}/rcsbl
+rm -f %{buildroot}%{_sbindir}/rcbrld
+ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rcsbl
+ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rcbrld
%endif
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%if %{suse_version} > 1310
+%if 0%{?suse_version} > 1310
%pre
%service_add_pre sbl.service
%service_add_pre brld.service
@@ -104,7 +101,7 @@
%post
/sbin/ldconfig
-%if %{suse_version} > 1310
+%if 0%{?suse_version} > 1310
%service_add_post sbl.service
%service_add_post brld.service
%else
@@ -114,39 +111,39 @@
%postun
/sbin/ldconfig
-%if %{suse_version} > 1310
+%if 0%{?suse_version} > 1310
%service_del_postun brld.service
%service_del_postun sbl.service
%else
-%{insserv_cleanup}
+%insserv_cleanup
%endif
%files
%defattr (-,root,root,755)
%doc doc/* Changelog
-%dir /etc/sbl
-%config /etc/sbl/keymap
-%config /etc/sbl/profile
-%config /etc/sbl/spkfilter
-%config /etc/sbl.conf
-%dir /usr/lib/sbl
-/usr/lib/sbl/lib
-/etc/sbl/brltbl
-/etc/sbl/spk
-/usr/sbin/sbl
-/usr/sbin/rcsbl
-/usr/sbin/brld
-/usr/sbin/rcbrld
-%{_libdir}/libbrld.so.1
-%if %{suse_version} > 1310
+%dir %{_sysconfdir}/sbl
+%config %{_sysconfdir}/sbl/keymap
+%config %{_sysconfdir}/sbl/profile
+%config %{_sysconfdir}/sbl/spkfilter
+%config %{_sysconfdir}/sbl.conf
+%dir %{_libexecdir}/sbl
+%{_libexecdir}/sbl/lib
+%{_sysconfdir}/sbl/brltbl
+%{_sysconfdir}/sbl/spk
+%{_sbindir}/sbl
+%{_sbindir}/rcsbl
+%{_sbindir}/brld
+%{_sbindir}/rcbrld
+%{_libdir}/libbrld.so*
+%if 0%{?suse_version} > 1310
%{_unitdir}/sbl.service
%{_unitdir}/brld.service
%else
-/etc/init.d/sbl
-/etc/init.d/brld
+%{_initddir}/sbl
+%{_initddir}/brld
%endif
-/usr/share/man/man8/brld.8.gz
-/usr/share/man/man8/sbl.8.gz
+%{_mandir}/man8/brld.8.gz
+%{_mandir}/man8/sbl.8.gz
%files orca
%defattr (-,root,root,755)
++++++ brld.service ++++++
--- /var/tmp/diff_new_pack.z3qKhl/_old 2015-06-16 14:04:52.000000000 +0200
+++ /var/tmp/diff_new_pack.z3qKhl/_new 2015-06-16 14:04:52.000000000 +0200
@@ -4,7 +4,7 @@
After=network.target
[Service]
-ExecStart=/usr/sbin/brld
+ExecStart=/usr/sbin/brld --nodaemon
[Install]
WantedBy=multi-user.target
++++++ sbl-init-scripts.patch ++++++
Author: Tim Ehlers <tehl...@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
++++++ sbl-install_perms.patch ++++++
--- sbl/Makefile
+++ sbl/Makefile
@@ -22,7 +22,7 @@
BRLDEV = /dev/ttyS0
EXEC_PATH = ./
REINSTALL_PATH = ./
-INSTALL_EXEC = --owner=root --group=root --mode=0744
+INSTALL_EXEC = --owner=root --group=root --mode=0755
# To compile in a.out (if you use ELF by default), you may be able to use
# `-b i486-linuxaout'; however, you may also need to use the -V flag, or
@@ -71,7 +71,7 @@
install -m 644 ../brltbl/* $(DESTDIR)$(CONFDIR)/sbl/brltbl
install --directory $(DESTDIR)$(CONFDIR)/init.d
install -m 644 ../config/sbl.conf $(DESTDIR)$(CONFDIR)
- install -m 744 ../config/sbl $(DESTDIR)$(CONFDIR)/init.d
+ install -m 755 ../config/sbl $(DESTDIR)$(CONFDIR)/init.d
ln -sf $(CONFDIR)/init.d/sbl $(DESTDIR)$(PREFIX)/sbin/rcsbl
install --directory $(DESTDIR)/var/run
# mkfifo $(DESTDIR)/var/run/sbl.fifo.in
++++++ sbl-libdir.patch ++++++
Author: Tim Ehlers <tehl...@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
++++++ sbl-nostrip.patch ++++++
--- /var/tmp/diff_new_pack.z3qKhl/_old 2015-06-16 14:04:52.000000000 +0200
+++ /var/tmp/diff_new_pack.z3qKhl/_new 2015-06-16 14:04:52.000000000 +0200
@@ -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
===================================================================
--- sbl/Makefile.orig
++++++ sbl-sppkdev.patch ++++++
Author: Lars Mueller <lmue...@suse.com>
Subject: Use sppkdev instead of spkdev in the documentation too.
Reported-by: Dr. Werner Fink <wer...@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 \
++++++ sbl.service ++++++
--- /var/tmp/diff_new_pack.z3qKhl/_old 2015-06-16 14:04:52.000000000 +0200
+++ /var/tmp/diff_new_pack.z3qKhl/_new 2015-06-16 14:04:52.000000000 +0200
@@ -4,6 +4,7 @@
After=network.target brld.service
[Service]
+Type=forking
ExecStart=/usr/sbin/sbl
[Install]
