From dc12f2741a03b1c61fd3958f426e6a0d9c0a1d9840d6029a99aa88b12a74c4e2 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Mon, 25 Feb 2008 16:57:11 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/sbl?expand=0&rev=9 --- sbl.changes | 45 +++++++++++++++++++++++++++++++------------- sbl.diff | 10 ---------- sbl.spec | 50 ++++++++++++++++++++++++++++++++++++++++--------- sblsrc-3.1.tbz2 | 4 ++-- 4 files changed, 75 insertions(+), 34 deletions(-) delete mode 100644 sbl.diff diff --git a/sbl.changes b/sbl.changes index 725fac1..693e77e 100644 --- a/sbl.changes +++ b/sbl.changes @@ -1,7 +1,22 @@ -------------------------------------------------------------------- -Wed Feb 6 10:58:53 CET 2008 - schwab@suse.de +-------------------------------------------------------------------- +Fri Feb 22 14:27:24 CET 2008 - marco@suse.de -- Reapply bug fixes. +- apply changes from schwab@suse.de (removed sa_restorer) + +-------------------------------------------------------------------- +Fri Feb 22 14:01:55 CET 2008 - marco@suse.de + +- fixed some build problems for x86_64 (using libdir instead of fixed pathnames) + +-------------------------------------------------------------------- +Tue Feb 19 14:19:57 CET 2008 - marco@suse.de + +- fixed a possible segfault in brld +- use select instead of usleep to wait for a brlkey-event in the brl-thread + of brld +- changed behavior of event_mode in brld + to avoid timeout problems with orca +- sigpipe is now ignored in sbl to avoid a crash if sbl uses speechd and speechd crashed -------------------------------------------------------------------- Tue Jan 29 17:10:13 CET 2008 - marco@suse.de @@ -10,7 +25,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 @@ -22,7 +37,6 @@ 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 @@ -32,7 +46,6 @@ 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 -------------------------------------------------------------------- @@ -54,6 +67,7 @@ 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 @@ -97,6 +111,7 @@ 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 @@ -122,6 +137,7 @@ 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 @@ -132,6 +148,7 @@ 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 @@ -150,6 +167,7 @@ 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 @@ -183,6 +201,7 @@ 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 @@ -201,6 +220,7 @@ 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 @@ -217,6 +237,8 @@ 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 @@ -231,7 +253,6 @@ 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) @@ -276,11 +297,6 @@ Wed Nov 29 23:58:37 CET 2000 - ro@suse.de - re-added patch from schwab@suse.de -------------------------------------------------------------------- -Sat Nov 18 18:24:14 CET 2000 - marco@suse.de - -- build shared-libs - ------------------------------------------------------------------- Sat Nov 18 18:23:17 CET 2000 - marco@suse.de @@ -290,7 +306,7 @@ Sat Nov 18 18:23:17 CET 2000 - marco@suse.de Thu Jun 29 11:04:06 CEST 2000 - marco@suse.de - suse-blinux.conf - profile2 is now y2bignfat (for yast2 textmode inst) -- keymaps - prof1,prof2 +: keymaps - prof1,prof2 ------------------------------------------------------------------- Wed Jun 28 19:28:18 CEST 2000 - marco@suse.de @@ -311,3 +327,6 @@ 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 + diff --git a/sbl.diff b/sbl.diff deleted file mode 100644 index 699782a..0000000 --- a/sbl.diff +++ /dev/null @@ -1,10 +0,0 @@ ---- brld/brld.c -+++ brld/brld.c -@@ -274,7 +274,6 @@ int main (int argc, char **argv) - saio.sa_handler = io_event; - sigemptyset (&saio.sa_mask); - saio.sa_flags = 0; -- saio.sa_restorer = 0; - sigaction (SIGIO, &saio, NULL); - - fcntl (brl_disp.brl_fd, F_SETOWN, getpid ()); diff --git a/sbl.spec b/sbl.spec index 73e454d..c38a74d 100644 --- a/sbl.spec +++ b/sbl.spec @@ -10,14 +10,14 @@ # norootforbuild + Name: sbl -BuildRequires: gcc-c++ +BuildRequires: gcc-c++ glib2 glib2-devel orca python python-devel Version: 3.1 -Release: 4 +Release: 8 License: GPL v2 or later Group: Hardware/Other Source: sblsrc-3.1.tbz2 -Patch: sbl.diff Summary: SuSE blinux PreReq: %insserv_prereq BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -28,19 +28,37 @@ braille displays. +Authors: +-------- + marco@suse.de + +%package orca +Summary: SuSE blinux +Group: Hardware/Other +Requires: orca sbl + +%description orca +SuSE blinux is a screen reader for the Linux console. It supports +braille displays. + + + Authors: -------- marco@suse.de %prep %setup -n sblsrc-3.1 -%patch +#%patch -p2 %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" +make -C orca_brl %install +install -d %{buildroot}%{_libdir}/python2.5/site-packages/orca make LIBINSTPATH=%{_libdir} DESTDIR=$RPM_BUILD_ROOT install +make -C orca_brl DESTDIR=%{buildroot} LIBINSTPATH=%{_libdir} install %clean rm -rf $RPM_BUILD_ROOT @@ -73,14 +91,27 @@ rm -rf $RPM_BUILD_ROOT %config /etc/init.d/brld %config /etc/suse-blinux.conf +%files orca +%{_libdir}/python2.5/site-packages/orca/brlmodule.so + %changelog -* Wed Feb 06 2008 schwab@suse.de -- Reapply bug fixes. +* Fri Feb 22 2008 marco@suse.de +- apply changes from schwab@suse.de (removed sa_restorer) +* Fri Feb 22 2008 marco@suse.de +- fixed some build problems for x86_64 (using libdir instead of fixed pathnames) +* Tue Feb 19 2008 marco@suse.de +- fixed a possible segfault in brld +- use select instead of usleep to wait for a brlkey-event in the brl-thread + of brld +- changed behavior of event_mode in brld + to avoid timeout problems with orca +- sigpipe is now ignored in sbl to avoid a crash if sbl uses speechd and speechd crashed * Tue Jan 29 2008 marco@suse.de - added "NOCONNECT" handlig in libbrld - 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 03 2007 marco@suse.de - improved process-detection - the foreground-process is now detected even if the @@ -107,6 +138,7 @@ rm -rf $RPM_BUILD_ROOT * Fri Mar 02 2007 marco@suse.de - added patch from ssommer@suse.de - changed screen device from /dev/vcsa0 to /dev/vcsa +- * Mon Jan 22 2007 ssommer@suse.de - fixed invalid operation error and deobfuscated the code a bit * Wed Jan 25 2006 mls@suse.de @@ -216,12 +248,10 @@ rm -rf $RPM_BUILD_ROOT * Thu Nov 30 2000 ro@suse.de - re-added patch from schwab@suse.de * Sat Nov 18 2000 marco@suse.de -- build shared-libs -* Sat Nov 18 2000 marco@suse.de - update to 1.1 * Thu Jun 29 2000 marco@suse.de - suse-blinux.conf - profile2 is now y2bignfat (for yast2 textmode inst) -- keymaps - prof1,prof2 + : keymaps - prof1,prof2 * Wed Jun 28 2000 marco@suse.de - change yast2-profile (frame-buffer) * Wed Jun 28 2000 marco@suse.de @@ -230,3 +260,5 @@ rm -rf $RPM_BUILD_ROOT - new profile for yast2 * Tue Jun 27 2000 marco@suse.de - dynamic linking + Sat Nov 18 18:24:14 CET 2000 +- build shared-libs diff --git a/sblsrc-3.1.tbz2 b/sblsrc-3.1.tbz2 index 95ed560..afdfe6c 100644 --- a/sblsrc-3.1.tbz2 +++ b/sblsrc-3.1.tbz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:aca72d0a73237cb7844725be992e5ebf39926b4504c7242fc649565017ce8b97 -size 300834 +oid sha256:f4374e06544ba32cd582a20dc1c59bc22472df82370898825714aa02cb1f4e0e +size 270679