From 6f20571433996426e5e55d90248b76870118f81db10cecf4f901476aa7eb69fc Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Fri, 2 Oct 2009 23:37:58 +0000 Subject: [PATCH] Accepting request 21324 from hardware Copy from hardware/sbl based on submit request 21324 from user marco OBS-URL: https://build.opensuse.org/request/show/21324 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/sbl?expand=0&rev=23 --- sbl-3.5.0.tbz2 | 3 + sbl.changes | 37 ++++-- sbl.spec | 312 +++++++--------------------------------------- sblsrc-3.4.0.tbz2 | 3 - 4 files changed, 75 insertions(+), 280 deletions(-) create mode 100644 sbl-3.5.0.tbz2 delete mode 100644 sblsrc-3.4.0.tbz2 diff --git a/sbl-3.5.0.tbz2 b/sbl-3.5.0.tbz2 new file mode 100644 index 0000000..31f6ccf --- /dev/null +++ b/sbl-3.5.0.tbz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e9dd6d2ef2df5efc92297dfbc2d13de097aae453597810669d31042e793e507b +size 204418 diff --git a/sbl.changes b/sbl.changes index eb1c6fc..6280582 100644 --- a/sbl.changes +++ b/sbl.changes @@ -1,3 +1,25 @@ +-------------------------------------------------------------------- +Tue Sep 29 12:44:43 CEST 2009 - marco@suse.de + +- updated to correct changelog + +-------------------------------------------------------------------- +Thu Sep 3 10:08:01 CEST 2009 - marco@suse.de + +- fixed problem with alvausb + +-------------------------------------------------------------------- +Wed Aug 19 00:59:02 CEST 2009 - marco@suse.de + +- sbl.spec - added correct python path + +-------------------------------------------------------------------- +Tue Aug 18 23:20:12 CEST 2009 - marco@suse.de + +- updated to version 3.5.0 +- added sbl-orca package for orca braille support + with brld + ------------------------------------------------------------------- Fri Nov 28 16:39:07 CET 2008 - ro@suse.de @@ -9,15 +31,12 @@ Tue Nov 18 13:36:30 CET 2008 - marco@suse.de - added new orca settings - fixed the brlwav driver problem - ------------------------------------------------------------------- Thu Oct 23 06:52:04 CEST 2008 - marco@suse.de - fixed an error in the a11y init script (braille=1 not set) bug#437723 - using -z instead of comparing the strings - - ------------------------------------------------------------------- Mon Oct 20 16:39:35 CEST 2008 - marco@suse.de @@ -34,8 +53,7 @@ Mon Oct 13 19:45:48 CEST 2008 - marco@suse.de ------------------------------------------------------------------- Wed Oct 8 17:11:00 CEST 2008 - marco@suse.de -- added a11y script temporarily - will make an own package "a11y" later - +- added a11y script temporarily - will make an own package "a11y" later ------------------------------------------------------------------- Mon Sep 29 14:01:50 CEST 2008 - ro@suse.de @@ -53,6 +71,7 @@ Fri Sep 26 17:00:57 CEST 2008 - marco@suse.de - change suse-init-scripts brld and sbl - brld will only start if brlname is not none - sbl will only start if brlname is not none and/or spkname is not none + -------------------------------------------------------------------- Thu Sep 11 04:29:07 CEST 2008 - marco@suse.de @@ -70,6 +89,7 @@ Thu Aug 14 09:22:32 CEST 2008 - marco@suse.de - removed orca_sbl - added orca-patch (orca-brld-patch.diff + -------------------------------------------------------------------- Thu Aug 14 09:01:16 CEST 2008 - marco@suse.de @@ -82,6 +102,7 @@ Thu Aug 14 09:01:16 CEST 2008 - marco@suse.de - brld - added attribute-underline for orca - some code cleanup - brld - fixed a possible iconv problem (orca) + -------------------------------------------------------------------- Sat Apr 26 14:32:40 CEST 2008 - marco@suse.de @@ -91,7 +112,7 @@ Sat Apr 26 14:32:40 CEST 2008 - marco@suse.de - improved the key-handling for some fhp-serial displays -------------------------------------------------------------------- -Sun Apr 6 22:55:08 CEST 2008 - marco@suse.de +Sun Apr 6 22:55:08 CEST 2008 - marco@suse.de - added some checks to the brl-drivers check the return value of "write" to detect a disconnect @@ -143,7 +164,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 @@ -155,6 +176,7 @@ 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 @@ -164,6 +186,7 @@ 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 -------------------------------------------------------------------- diff --git a/sbl.spec b/sbl.spec index 13e7496..102c9bd 100644 --- a/sbl.spec +++ b/sbl.spec @@ -1,7 +1,7 @@ # -# spec file for package sbl (Version 3.4.0) +# spec file for package sbl (Version 3.5.0) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,16 +19,15 @@ Name: sbl -BuildRequires: gcc-c++ libusb-devel -Version: 3.4.0 -Release: 12 -License: GPL v2 or later +BuildRequires: bluez-devel gcc-c++ libusb-devel orca speechd-devel +Version: 3.5.0 +Release: 1 +License: GPL Group: Hardware/Other -Source: sblsrc-3.4.0.tbz2 +Source: sbl-3.5.0.tbz2 Summary: SuSE blinux PreReq: %insserv_prereq BuildRoot: %{_tmppath}/%{name}-%{version}-build -#Requires: libusb %description SuSE blinux is a screen reader for the Linux console. It supports @@ -40,12 +39,27 @@ Authors: -------- marco@suse.de +%package orca +License: GPL v2 only ; GPL v2 or later +Summary: brld-orca brlapi +Group: Productivity/Multimedia/Sound/Utilities +Requires: python orca + +%description orca +this python module enables orca to use brld for braille output + +Authors: +-------- + Marco Skambraks + Halim Sahin + + %prep -%setup -n sblsrc-3.4.0 +%setup -n sbl-3.5.0 #%patch -p2 %build -make CFLAGS="$RPM_OPT_FLAGS -D_POSIX_C_SOURCE=2 -D_BSD_SOURCE -fPIC" LIB_CFLAGS="$RPM_OPT_FLAGS -D_POSIX_C_SOURCE=2 -D_BSD_SOURCE -fPIC" +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" %install make LIBINSTPATH=%{_libdir} DESTDIR=$RPM_BUILD_ROOT install @@ -57,7 +71,6 @@ rm -rf $RPM_BUILD_ROOT /sbin/ldconfig %{insserv_force_if_yast etc/init.d/sbl } %{insserv_force_if_yast etc/init.d/brld } -%{insserv_force_if_yast etc/init.d/a11y } %postun /sbin/ldconfig @@ -66,268 +79,27 @@ rm -rf $RPM_BUILD_ROOT %files %defattr (-,root,root,755) %doc doc/* Changelog -/usr/lib/suse-blinux/keymap -/usr/lib/suse-blinux/lib -%dir /usr/lib/suse-blinux -/usr/lib/suse-blinux/profile -/usr/lib/suse-blinux/brltbl -/usr/lib/suse-blinux/spkfilter -/usr/lib/suse-blinux/spk -/usr/lib/suse-blinux/sbl +%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 -/usr/bin/a11y -%dir /usr/share/a11y -%dir /usr/share/a11y/orca -/usr/share/a11y/orca/* %{_libdir}/libbrld.so.1 -%config /etc/init.d/sbl -%config /etc/init.d/brld -%config /etc/init.d/a11y -%config /etc/suse-blinux.conf -%config /etc/a11y.conf +/etc/init.d/sbl +/etc/init.d/brld +/usr/share/man/man8/brld.8.gz +/usr/share/man/man8/sbl.8.gz + +%files orca +%defattr (-,root,root,755) +%{py_sitedir}/orca/brlapi.py %changelog -* Fri Nov 28 2008 ro@suse.de -- use -fPIC also in CFLAGS to fix build on x86_64 -* Tue Nov 18 2008 marco@suse.de -- added new orca settings -- fixed the brlwav driver problem -* Thu Oct 23 2008 marco@suse.de -- fixed an error in the a11y init script (braille=1 not set) bug#437723 -- using -z instead of comparing the strings -* Mon Oct 20 2008 marco@suse.de -- fixed possible buffer overflow in brld -- use localhost only in brld -- removed mknod from brld/sbl init scripts -* Mon Oct 13 2008 marco@suse.de -- changed default orca settings -- default synth is espeak -* Wed Oct 08 2008 marco@suse.de -- added a11y script temporarily - will make an own package "a11y" later -* Mon Sep 29 2008 ro@suse.de -- drop manual requires for libusb -* Mon Sep 29 2008 marco@suse.de -- fix typo in brld.c -* Fri Sep 26 2008 marco@suse.de -- change suse-init-scripts brld and sbl -- brld will only start if brlname is not none -- sbl will only start if brlname is not none and/or spkname is not none -* Thu Sep 11 2008 marco@suse.de -- added further speech-cursor functions - spkwordlft, spkwordrgt, spkstop -- spkcsrxy added TTY number -- brld and drivers - added experimental USB support -- added experimental alvausb support for alva sat540 (brlname=alvausb) -- added some errorhandling (brld) -- added handling for unknown characters for the iconv stuff (brld) -* Thu Aug 14 2008 marco@suse.de -- removed orca_sbl -- added orca-patch (orca-brld-patch.diff -* Thu Aug 14 2008 marco@suse.de -- added speech-cursor - now you can navigate over the screen with a speech-cursor - there are three additional functions - spkcsrlft, spkcsrrgt, spkxy -- fixed possible segfault in ht-driver (thanks to Klaus Knopper) -- added the new functions to the keymaps -- brld - added attribute-underline for orca -- some code cleanup -- brld - fixed a possible iconv problem (orca) -* Sat Apr 26 2008 marco@suse.de -- added brl-driver patch and brld patch from Klaus Knopper - the patch added the missing init stuff for brl.x and brl.y - it also removes some mutex lock/unlock in brld -- improved the key-handling for some fhp-serial displays -* Sun Apr 06 2008 marco@suse.de -- added some checks to the brl-drivers - check the return value of "write" to detect a disconnect -- new init-sequence for fhp el-usb-displays -- Fhp_usb/Fhp driver - use "select" in readbrl to wait for incoming data -- fixed a possible memory-lack in Fhp_usb and Fhp -- clear and reload the keymaps after sbl has reconnected to brld -- some code cleanup in sbl -- added some brl_fd checks to brld -- brld - added mutexes to brl_ok to protect brl_dev and keybuf -* Mon Mar 24 2008 Klaus Knopper knoppix@knopper.net -- make brld start with a configured but disconnected braille device -- auto-reconnect in brld -- change device drivers in order to always get geometry regardless - of device open -* Mon Mar 17 2008 marco@suse.de -- added suppot for kbdsniffd to sbl -- added config variables to suse-blinux.conf -- kbd_key and kbd_port -- removed config variable brld_host (using only localhost) -- keymaps - only kbdsniffon1 is used to enable sniffing mode -- kbdsniffon2 and kbdsniffoff are not longer used -- fixed a possilbe bug during brld reconnect -- brld is now listening only on localhost not on all devices -- using libbrld.so.1 instead of libbrld.so -- using libspeechd.so.2 instead of libspeechd.so -- sbl does not longer require brld at start-time -* 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 -- current process has not the highest PID -* Wed Oct 24 2007 marco@suse.de -- added support for handytech evolution 88 and 64 -* Mon Jul 23 2007 marco@suse.de -- changed default value for brlname to none in suse-blinux.conf -- fixed build-problems for x86_64 - do make LIBINSTPATH=/usr/lib64 for x86_64 architectures -* Tue Jul 17 2007 marco@suse.de -- first release of brld -* Sat Jul 14 2007 marco@suse.de -- version 3.0 -- sbl now connects to brld (part of the sbl package) -- added speechdispatcher support (thanks to Halim Sahin) -- added some patches to the HT driver to improve - the handling of disconnects if Bt is used via rfcomm (thanks to Klaus Knopper) -- if sbl is used with the kbd_sniffer-kernel-patch keyboard.map is used by default - keyboardsettings in .map will overwrite the settings in - keyboard.map (thanks to Klaus Knopper) -- impoved the fhp_usb driver - handling of incoming keyevents is now more - stable -* 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 -- converted neededforbuild to BuildRequires -* Sat Jan 14 2006 schwab@suse.de -- Don't strip binaries. -- Always use RPM_OPT_FLAGS. -* Fri Jun 17 2005 meissner@suse.de -- use RPM_OPT_FLAGS. -* Sat May 28 2005 olh@suse.de -- cast to avoid build failure -* Wed Jun 16 2004 ro@suse.de -- cast to avoid gcc warning -* Fri Mar 26 2004 kukuk@suse.de -- don't apply removed patch -- build as user -* Wed Mar 24 2004 marco@suse.de -- added portability patch from schwab@suse.de -* Wed Mar 17 2004 schwab@suse.de -- Remove bogus use of sa_restorer. -- Fix portability bugs. -* Mon Mar 15 2004 marco@suse.de -- fixed ia64 errors in softspeech_server.c -* Mon Mar 15 2004 marco@suse.de -- fixed FB bug resolutions > 800x600 now OK -- disabled mbrdico support for this version (2.2) -- added new softspeech-lib -* Tue Mar 09 2004 marco@suse.de -- added brlstar80 support -- improved softspeech support -- improve speech-only navigation (kernel patch needed) -- added brllino support (experimental) -* Sun Mar 07 2004 ro@suse.de -- create pipes with mode 644 -* Mon Aug 11 2003 marco@suse.de -- add power-braille-support (experimental) -- add mbrdico support in softspeech_server -* Thu Jun 05 2003 coolo@suse.de -- use BuildRoot -- move rc* link to /usr/sbin -- replaced invalid rpath -* Thu Sep 12 2002 marco@suse.de -- removed lib-mn and lib-blazi -* Tue Sep 10 2002 marco@suse.de -- added profiles y2base and y2menu -- removed include of rc.config in suse-blinux script -* Tue Aug 20 2002 ro@suse.de -- added prereq (#17984) -* Thu Jul 25 2002 marco@suse.de -- add brlwave features -- fixed bug in startscript -- modified spkfilter for multi-language-support -* Thu Jun 13 2002 ro@suse.de -- always use macros when calling insserv -* Thu Mar 21 2002 mmj@suse.de -- Fixed typo (Bug #14709) -* Sun Feb 10 2002 marco@suse.de -- add brlstar40-support -* Thu Jan 31 2002 marco@suse.de -- cleaned up the profile and keymap directory -- fixed the lnrgt bug -* Tue Jan 29 2002 marco@suse.de -- add patch from schwab@suse.de -- add string-compression for speech -- add a new handling of screen-memory (for frame-buffer) -* Wed Jan 23 2002 schwab@suse.de -- Fix to compile. -* Tue Jan 15 2002 marco@suse.de -- moved fifos from /tmp to /var/run -- using a new version of softspeech.so -* Mon Sep 17 2001 marco@suse.de -- fixed bug in startup-script (status) -* Thu Sep 06 2001 marco@suse.de -- add check before using fifos -* Wed Aug 15 2001 marco@suse.de -- add patch from ro@suse.de (use g++ instead of gcc for linking) -* Mon Aug 13 2001 marco@suse.de -- add patch from schwab@suse.de -- add new documentation -* Mon Aug 13 2001 schwab@suse.de -- Remove references to sa_restorer. -- Don't call linker directly. -* Mon Aug 13 2001 marco@suse.de -- add combibraille-support (25,40,80) -- fix tiny bug -- fix handytech bug (statuscells) -- add debug functions -- add kbd_sniff-support using kernel-patch 2.2.x -- improve softspeech-interface -- modify yast2-profile -- fix start-script suse-blinux -- insert the changes from schwab@suse.de -- add baum vario support -* Sun Jun 17 2001 schwab@suse.de -- Fix buiding of shared libraries. -- Fix missing declarations. -- Remove useless inline. -* Sat May 05 2001 schwab@suse.de -- Fix building on non ia32 platforms. -* Mon Apr 30 2001 marco@suse.de -- update to 1.2 -* Tue Dec 12 2000 marco@suse.de -- integrated patches -* Thu Nov 30 2000 ro@suse.de -- fixed start-script to install in /etc/init.d -- use doc macro in specfile -* Wed Nov 29 2000 ro@suse.de -- re-added patch from schwab@suse.de -* 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 -* Wed Jun 28 2000 marco@suse.de -- change yast2-profile (frame-buffer) -* Wed Jun 28 2000 marco@suse.de -- bug-fix in profile-directory -* Tue Jun 27 2000 marco@suse.de -- 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.4.0.tbz2 b/sblsrc-3.4.0.tbz2 deleted file mode 100644 index e4e69a4..0000000 --- a/sblsrc-3.4.0.tbz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:94a7271284fdcf7b00b54e46ebab5d127e0957ca22c81c0a46c47a8f7198254b -size 183995