From 7686304161b546df581902d69a4ec7ccef9f80e57f689542f0a9955171b637f7 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Mon, 12 Oct 2009 13:47:09 +0000 Subject: [PATCH] Accepting request 22124 from hardware Copy from hardware/sbl based on submit request 22124 from user vbotka OBS-URL: https://build.opensuse.org/request/show/22124 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/sbl?expand=0&rev=24 --- sbl-shared.patch | 13 +++++++++++++ sbl.changes | 29 ++++++++++++++++------------- sbl.spec | 13 +++++++++---- 3 files changed, 38 insertions(+), 17 deletions(-) create mode 100644 sbl-shared.patch diff --git a/sbl-shared.patch b/sbl-shared.patch new file mode 100644 index 0000000..6679cb7 --- /dev/null +++ b/sbl-shared.patch @@ -0,0 +1,13 @@ +Index: sbl/Makefile +=================================================================== +--- sbl/Makefile.orig ++++ sbl/Makefile +@@ -126,7 +126,7 @@ inskey_lnx.o: inskey_lnx.c inskey.h + $(CC) $(CFLAGS) -c inskey_lnx.c + + misc.o: misc.c misc.h +- $(CC) $(CFLAGS) -c misc.c ++ $(CC) -fPIC $(CFLAGS) -c misc.c + + sbl.o: sbl.c kbdsniff.c system.c selkey.c + $(CC) $(CFLAGS) '-DPROGPATH="$(SBLPATH)"' '-DCONFDIR="$(CONFDIR)"' -c $? diff --git a/sbl.changes b/sbl.changes index 6280582..207de84 100644 --- a/sbl.changes +++ b/sbl.changes @@ -1,25 +1,29 @@ +------------------------------------------------------------------- +Wed Oct 7 20:18:16 UTC 2009 - aj@suse.de + +- Fix build on x86-64. +- Use proper python macros. + -------------------------------------------------------------------- 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 +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 @@ -31,12 +35,15 @@ 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 @@ -53,7 +60,8 @@ 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 @@ -71,7 +79,6 @@ 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 @@ -89,7 +96,6 @@ 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 @@ -102,7 +108,6 @@ 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 @@ -112,7 +117,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 @@ -164,7 +169,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 @@ -176,7 +181,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 @@ -186,7 +190,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 -------------------------------------------------------------------- diff --git a/sbl.spec b/sbl.spec index 102c9bd..2d79a11 100644 --- a/sbl.spec +++ b/sbl.spec @@ -21,10 +21,11 @@ Name: sbl BuildRequires: bluez-devel gcc-c++ libusb-devel orca speechd-devel Version: 3.5.0 -Release: 1 +Release: 2 License: GPL Group: Hardware/Other Source: sbl-3.5.0.tbz2 +Patch1: sbl-shared.patch Summary: SuSE blinux PreReq: %insserv_prereq BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -43,7 +44,11 @@ Authors: License: GPL v2 only ; GPL v2 or later Summary: brld-orca brlapi Group: Productivity/Multimedia/Sound/Utilities -Requires: python orca +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 @@ -56,7 +61,7 @@ Authors: %prep %setup -n sbl-3.5.0 -#%patch -p2 +%patch1 -p0 %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" @@ -100,6 +105,6 @@ rm -rf $RPM_BUILD_ROOT %files orca %defattr (-,root,root,755) -%{py_sitedir}/orca/brlapi.py +%{python_sitearch}/orca/brlapi.py* %changelog