From b9b72d08244522fd6d360e7b13388d4e6dae2344ccdcaa3d481ebfdcea951855 Mon Sep 17 00:00:00 2001 From: Ruediger Oertel Date: Thu, 11 Sep 2014 11:54:32 +0000 Subject: [PATCH 1/4] - install binaries with mode 0755 not 0744 (bnc#851625) OBS-URL: https://build.opensuse.org/package/show/hardware/sbl?expand=0&rev=22 --- sbl-install_perms.patch | 33 +++++++++++++++++++++++++++++++++ sbl.changes | 5 +++++ sbl.spec | 2 ++ 3 files changed, 40 insertions(+) create mode 100644 sbl-install_perms.patch diff --git a/sbl-install_perms.patch b/sbl-install_perms.patch new file mode 100644 index 0000000..7770c3a --- /dev/null +++ b/sbl-install_perms.patch @@ -0,0 +1,33 @@ +--- 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 +@@ -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 diff --git a/sbl.changes b/sbl.changes index 81d84d7..bea0a20 100644 --- a/sbl.changes +++ b/sbl.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Sep 11 13:53:54 CEST 2014 - ro@suse.de + +- install binaries with mode 0755 not 0744 (bnc#851625) + ------------------------------------------------------------------- Fri Sep 5 14:46:52 CEST 2014 - ro@suse.de diff --git a/sbl.spec b/sbl.spec index 8db6032..f6c52d2 100644 --- a/sbl.spec +++ b/sbl.spec @@ -33,6 +33,7 @@ Source1: sbl.service Source2: brld.service Patch1: sbl-shared.patch Patch2: sbl-nostrip.patch +Patch3: sbl-install_perms.patch Summary: SUSE blinux License: GPL-2.0+ Group: Hardware/Other @@ -72,6 +73,7 @@ Authors: %setup -q %patch1 -p0 %patch2 -p0 +%patch3 %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" From c7f79869c00089c70404306e773fac4fa209eb9eb6886cadbca02060b6f9141d Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Sat, 30 May 2015 13:37:59 +0000 Subject: [PATCH 2/4] Accepting request 307373 from home:lmuelle:el80c 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 --- brld.service | 2 +- sbl-3.5.0.20130317.git7a75bc29.tar.bz2 | 3 +++ sbl-3.5.0.tbz2 | 3 --- sbl-init-scripts.patch | 16 ++++++++++++++ sbl-install_perms.patch | 13 ----------- sbl-libdir.patch | 18 ++++++++++++++++ sbl-nostrip.patch | 18 ---------------- sbl-sppkdev.patch | 30 ++++++++++++++++++++++++++ sbl.changes | 23 +++++++++++++++++--- sbl.service | 1 + sbl.spec | 26 ++++++++++------------ 11 files changed, 100 insertions(+), 53 deletions(-) create mode 100644 sbl-3.5.0.20130317.git7a75bc29.tar.bz2 delete mode 100644 sbl-3.5.0.tbz2 create mode 100644 sbl-init-scripts.patch create mode 100644 sbl-libdir.patch create mode 100644 sbl-sppkdev.patch diff --git a/brld.service b/brld.service index 5e5717a..28a9dd8 100644 --- a/brld.service +++ b/brld.service @@ -4,7 +4,7 @@ Wants=network.target After=network.target [Service] -ExecStart=/usr/sbin/brld +ExecStart=/usr/sbin/brld --nodaemon [Install] WantedBy=multi-user.target diff --git a/sbl-3.5.0.20130317.git7a75bc29.tar.bz2 b/sbl-3.5.0.20130317.git7a75bc29.tar.bz2 new file mode 100644 index 0000000..46c47d0 --- /dev/null +++ b/sbl-3.5.0.20130317.git7a75bc29.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3dcaa96ec4b76cfa4a472b9055f35042ecde9f33bc0d9aa858d2f511559ef1de +size 177642 diff --git a/sbl-3.5.0.tbz2 b/sbl-3.5.0.tbz2 deleted file mode 100644 index 31f6ccf..0000000 --- a/sbl-3.5.0.tbz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e9dd6d2ef2df5efc92297dfbc2d13de097aae453597810669d31042e793e507b -size 204418 diff --git a/sbl-init-scripts.patch b/sbl-init-scripts.patch new file mode 100644 index 0000000..53147d7 --- /dev/null +++ b/sbl-init-scripts.patch @@ -0,0 +1,16 @@ +Author: Tim Ehlers +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 diff --git a/sbl-install_perms.patch b/sbl-install_perms.patch index 7770c3a..9d3f083 100644 --- a/sbl-install_perms.patch +++ b/sbl-install_perms.patch @@ -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 @@ -22,7 +22,7 @@ diff --git a/sbl-libdir.patch b/sbl-libdir.patch new file mode 100644 index 0000000..0ccf18a --- /dev/null +++ b/sbl-libdir.patch @@ -0,0 +1,18 @@ +Author: Tim Ehlers +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 diff --git a/sbl-nostrip.patch b/sbl-nostrip.patch index c5742f4..c13c993 100644 --- a/sbl-nostrip.patch +++ b/sbl-nostrip.patch @@ -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 diff --git a/sbl-sppkdev.patch b/sbl-sppkdev.patch new file mode 100644 index 0000000..3e94530 --- /dev/null +++ b/sbl-sppkdev.patch @@ -0,0 +1,30 @@ +Author: Lars Mueller +Subject: Use sppkdev instead of spkdev in the documentation too. +Reported-by: Dr. Werner Fink + +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 \ diff --git a/sbl.changes b/sbl.changes index bea0a20..b78e6e6 100644 --- a/sbl.changes +++ b/sbl.changes @@ -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 -- 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 -- add systemd support (bnc#865857) +- add systemd support (bnc#865857) ------------------------------------------------------------------- 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 diff --git a/sbl.service b/sbl.service index 7ca31c2..4a16244 100644 --- a/sbl.service +++ b/sbl.service @@ -4,6 +4,7 @@ Wants=network.target brld.service After=network.target brld.service [Service] +Type=forking ExecStart=/usr/sbin/sbl [Install] diff --git a/sbl.spec b/sbl.spec index f6c52d2..a5e161b 100644 --- a/sbl.spec +++ b/sbl.spec @@ -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 @@ -26,14 +26,16 @@ BuildRequires: speechd-devel BuildRequires: pkgconfig(libsystemd-daemon) %{?systemd_requires} %endif -Version: 3.5.0 +Version: 3.5.0.20130317.git7a75bc29 Release: 0 -Source: sbl-3.5.0.tbz2 +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 Summary: SUSE blinux License: GPL-2.0+ Group: Hardware/Other @@ -45,11 +47,6 @@ SUSE blinux is a screen reader for the Linux console. It supports braille displays. - -Authors: --------- - marco@suse.de - %package orca Summary: brld-orca brlapi License: GPL-2.0 and GPL-2.0+ @@ -63,22 +60,21 @@ Requires: orca %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 %patch3 +%if "%{_libdir}" == "/usr/lib64" +%patch4 -p1 +%endif +%patch5 -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" -%install +%install make LIBINSTPATH=%{_libdir} DESTDIR=$RPM_BUILD_ROOT install %if %{suse_version} > 1310 rm -f $RPM_BUILD_ROOT/etc/init.d/sbl @@ -139,7 +135,7 @@ rm -rf $RPM_BUILD_ROOT /usr/sbin/rcsbl /usr/sbin/brld /usr/sbin/rcbrld -%{_libdir}/libbrld.so.1 +%{_libdir}/libbrld.so* %if %{suse_version} > 1310 %{_unitdir}/sbl.service %{_unitdir}/brld.service From 05c9a8c1d3dab51b08ba9a54c49d8c60ef8825169ed760bec7032978e958aa8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Wed, 10 Jun 2015 08:34:35 +0000 Subject: [PATCH 3/4] Accepting request 311399 from home:pluskalm:branches:hardware - Update changelog to mention new patch (sbl-install_perms.patch) * sbl-install_perms.patch OBS-URL: https://build.opensuse.org/request/show/311399 OBS-URL: https://build.opensuse.org/package/show/hardware/sbl?expand=0&rev=24 --- sbl.changes | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sbl.changes b/sbl.changes index b78e6e6..a87e8a8 100644 --- a/sbl.changes +++ b/sbl.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jun 10 07:48:22 UTC 2015 - mpluskal@suse.com + +- Update changelog to mention new patch (sbl-install_perms.patch) + ------------------------------------------------------------------- Fri May 15 14:02:26 UTC 2015 - lmuelle@suse.com @@ -19,6 +24,7 @@ Wed May 13 23:19:16 UTC 2015 - lmuelle@suse.com Thu Sep 11 13:53:54 CEST 2014 - ro@suse.de - install binaries with mode 0755 not 0744 (bnc#851625) + * sbl-install_perms.patch ------------------------------------------------------------------- Fri Sep 5 14:46:52 CEST 2014 - ro@suse.de From db92e3a2deda1d23194daae40e292c7fd67f1cf78e8fbcd5fde68a09c90ce7e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Mon, 15 Jun 2015 08:31:57 +0000 Subject: [PATCH 4/4] Accepting request 311985 from home:pluskalm:branches:hardware - Cleanup spec file with spec-clener - Apply sbl-sppkdev.patch - Update rcservice symlinks OBS-URL: https://build.opensuse.org/request/show/311985 OBS-URL: https://build.opensuse.org/package/show/hardware/sbl?expand=0&rev=25 --- sbl.changes | 7 ++++ sbl.spec | 113 ++++++++++++++++++++++++++-------------------------- 2 files changed, 63 insertions(+), 57 deletions(-) diff --git a/sbl.changes b/sbl.changes index a87e8a8..75a3af2 100644 --- a/sbl.changes +++ b/sbl.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sat Jun 13 11:49:56 UTC 2015 - mpluskal@suse.com + +- Cleanup spec file with spec-clener +- Apply sbl-sppkdev.patch +- Update rcservice symlinks + ------------------------------------------------------------------- Wed Jun 10 07:48:22 UTC 2015 - mpluskal@suse.com diff --git a/sbl.spec b/sbl.spec index a5e161b..d48f128 100644 --- a/sbl.spec +++ b/sbl.spec @@ -17,17 +17,11 @@ Name: sbl -BuildRequires: bluez-devel -BuildRequires: gcc-c++ -BuildRequires: libusb-devel -BuildRequires: orca -BuildRequires: speechd-devel -%if %{suse_version} > 1310 -BuildRequires: pkgconfig(libsystemd-daemon) -%{?systemd_requires} -%endif 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 @@ -36,61 +30,66 @@ Patch2: sbl-nostrip.patch Patch3: sbl-install_perms.patch Patch4: sbl-libdir.patch Patch5: sbl-init-scripts.patch -Summary: SUSE blinux -License: GPL-2.0+ -Group: Hardware/Other -PreReq: %insserv_prereq +Patch6: sbl-sppkdev.patch +BuildRequires: bluez-devel +BuildRequires: gcc-c++ +BuildRequires: libusb-devel +BuildRequires: orca +BuildRequires: speechd-devel 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 %description SUSE blinux is a screen reader for the Linux console. It supports braille displays. - %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 - %prep %setup -q -%patch1 -p0 -%patch2 -p0 +%patch1 +%patch2 %patch3 -%if "%{_libdir}" == "/usr/lib64" +%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 @@ -102,7 +101,7 @@ rm -rf $RPM_BUILD_ROOT %post /sbin/ldconfig -%if %{suse_version} > 1310 +%if 0%{?suse_version} > 1310 %service_add_post sbl.service %service_add_post brld.service %else @@ -112,39 +111,39 @@ rm -rf $RPM_BUILD_ROOT %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 +%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 %{suse_version} > 1310 +%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)