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] 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)