From e966baaa63a935c1c92d605697da620b73fe3fe2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0t=C4=9Bp=C3=A1n=20Kasal?= Date: Mon, 2 Nov 2009 09:36:30 +0000 Subject: [PATCH] - move data-directory back to default: /etc/brltty - move brltty to /bin and /lib, so that it can be used to repair the system without /usr mounted (#276181) - move vstp and libbrlttybba.so to brlapi - brltty no longer requires brlapi - brlapi now requires brltty from the same build - build the TTY driver (it was disabled since it first appered in 3.7.2-1) - build with speech-dispatcher, packed into a separate sub-package --- brltty.spec | 83 +++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 61 insertions(+), 22 deletions(-) diff --git a/brltty.spec b/brltty.spec index a5be54d..14919dc 100644 --- a/brltty.spec +++ b/brltty.spec @@ -5,11 +5,14 @@ %{!?pyver: %define pyver %(%{__python} -c "import sys; v=sys.version_info[:2]; print '%d.%d'%v")} %{!?tcl_version: %define tcl_version %(echo 'puts $tcl_version' | tclsh)} -%{!?tcl_sitearch: %define tcl_sitearch %{_libdir}/tcl%{tcl_version}} +%{!?tcl_sitearch: %define tcl_sitearch %{_prefix}/%{_lib}/tcl%{tcl_version}} + +%define _exec_prefix %{nil} +%define _libdir /%{_lib} Name: brltty Version: %{pkg_version} -Release: 1%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: System Environment/Daemons URL: http://mielke.cc/brltty/ @@ -21,7 +24,6 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) Summary: Braille display driver for Linux/Unix BuildRequires: byacc glibc-kernheaders BuildRequires: autoconf -Requires: brlapi = %{api_version}-%{release} %description BRLTTY is a background process (daemon) which provides @@ -29,7 +31,17 @@ access to the Linux/Unix console (when in text mode) for a blind person using a refreshable braille display. It drives the braille display and provides complete screen review functionality. -Some speech capability has also been incorporated. +BRLTTY can also work with speech synthetizers; if you want to use it with +Speech Dispatcher, please install also package %{name}-speech-dispatcher. + +%package speech-dispatcher +Summary: Speech Dispatcher driver for BRLTTY +Group: System Environment/Daemons +License: GPLv2+ +BuildRequires: speech-dispatcher-devel +Requires: %{name} = %{pkg_version}-%{release} +%description speech-dispatcher +This package provides the Speech Dispatcher driver for BRLTTY. %package xw Summary: XWindow driver for BRLTTY @@ -55,6 +67,7 @@ Version: %{api_version} Group: Applications/System License: LGPLv2+ Summary: Appliation Programming Interface for BRLTTY +Requires: %{name} = %{pkg_version}-%{release} %description -n brlapi This package provides the run-time support for the Application Programming Interface to BRLTTY. @@ -86,7 +99,7 @@ Version: %{api_version} Group: Development/System License: LGPLv2+ Requires: brlapi = %{api_version}-%{release} -BuildRequires: tcl-devel tcl +BuildRequires: tcl-devel Summary: Tcl binding for BrlAPI %description -n tcl-brlapi This package provides the Tcl binding for BrlAPI. @@ -130,8 +143,7 @@ done # there is no curses packages in BuildRequires, so the package builds # without them in mock; let's express this decision explicitly %configure CPPFLAGS="$java_inc" --disable-stripping --without-curses \ - --with-data-directory='${datadir}/${PACKAGE_NAME}' \ - --with-install-root="${RPM_BUILD_ROOT}" --with-braille-driver=-tt + --with-install-root="${RPM_BUILD_ROOT}" --with-speechd=%{_prefix} make %{?_smp_mflags} find . \( -path ./doc -o -path ./Documents \) -prune -o \ @@ -144,8 +156,12 @@ done %install rm -rf $RPM_BUILD_ROOT -make %{?_smp_mflags} install -mv "$RPM_BUILD_ROOT%{_datadir}/brltty/brltty-pm.conf" \ +# does not seem to be parallel safe +make install +mv "$RPM_BUILD_ROOT%{_libdir}/libbrlapi.a" "$RPM_BUILD_ROOT%{_prefix}/%{_lib}/" +rm "$RPM_BUILD_ROOT%{_libdir}/libbrlapi.so" +ln -s ../../%{_lib}/libbrlapi.so "$RPM_BUILD_ROOT%{_prefix}/%{_lib}/" +mv "$RPM_BUILD_ROOT%{_sysconfdir}/brltty/brltty-pm.conf" \ doc/Drivers/Braille/Papenmeier/ install -d -m 755 "${RPM_BUILD_ROOT}%{_sysconfdir}" "$RPM_BUILD_ROOT%{_mandir}/man5" install -m 644 Documents/brltty.conf "${RPM_BUILD_ROOT}%{_sysconfdir}" @@ -153,10 +169,7 @@ echo ".so man1/brltty.1" > $RPM_BUILD_ROOT%{_mandir}/man5/brltty.conf.5 # clean up the manuals: rm Documents/Manual-*/*/{*.mk,*.made,Makefile*} - -ls ${RPM_BUILD_ROOT}/%{_libdir}/brltty/*.so | \ - grep -v 'libbrlttybxw.so\|libbrlttyxas.so' | \ - sed -e "s|$RPM_BUILD_ROOT||" >libs.filelist +mv Documents/BrlAPIref/{html,BrlAPIref} %clean rm -rf $RPM_BUILD_ROOT @@ -182,22 +195,32 @@ then fi exit 0 -%files -f libs.filelist +%post -n brlapi -p /sbin/ldconfig +%postun -n brlapi -p /sbin/ldconfig + +%files %defattr(-,root,root) %config(noreplace) %{_sysconfdir}/brltty.conf +%{_sysconfdir}/brltty/ %{_bindir}/brltty %{_bindir}/brltty-* -%{_bindir}/vstp -%dir %{_libdir}/brltty -%{_datadir}/brltty +%{_libdir}/brltty/ +%exclude %{_libdir}/brltty/libbrlttybba.so +%exclude %{_libdir}/brltty/libbrlttybxw.so +%exclude %{_libdir}/brltty/libbrlttyssd.so +%exclude %{_libdir}/brltty/libbrlttyxas.so %doc LICENSE-GPL LICENSE-LGPL %doc Documents/ChangeLog Documents/TODO %doc Documents/Manual-BRLTTY/ %doc doc/* %doc %{_mandir}/man[15]/brltty.* -%doc %{_mandir}/man1/vstp.* + +%files speech-dispatcher +%doc Drivers/Speech/SpeechDispatcher/README +%{_libdir}/brltty/libbrlttyssd.so %files xw +%doc Drivers/Braille/XWindow/README %{_libdir}/brltty/libbrlttybxw.so %files at-spi @@ -205,20 +228,23 @@ exit 0 %files -n brlapi %defattr(-,root,root) +%{_bindir}/vstp %{_bindir}/xbrlapi +%{_libdir}/brltty/libbrlttybba.so %{_libdir}/libbrlapi.so.* +%doc Drivers/Braille/XWindow/README %doc Documents/Manual-BrlAPI/ -%doc Documents/README.Seika %doc %{_mandir}/man1/xbrlapi.* +%doc %{_mandir}/man1/vstp.* %files -n brlapi-devel %defattr(-,root,root) -%{_libdir}/libbrlapi.a -%{_libdir}/libbrlapi.so +%{_prefix}/%{_lib}/libbrlapi.a +%{_prefix}/%{_lib}/libbrlapi.so %{_includedir}/brltty %{_includedir}/brlapi*.h %doc %{_mandir}/man3/brlapi_*.3* -%doc Documents/BrlAPIref/html +%doc Documents/BrlAPIref/BrlAPIref/ %files -n tcl-brlapi %defattr(-,root,root) @@ -236,6 +262,18 @@ exit 0 %changelog +* Sun Nov 1 2009 Stepan Kasal - 4.1-3 +- build the TTY driver (it was disabled since it first appered in 3.7.2-1) +- build with speech-dispatcher, packed into a separate sub-package + +* Fri Oct 30 2009 Stepan Kasal - 4.1-2 +- move data-directory back to default: /etc/brltty +- move brltty to /bin and /lib, so that it can be used to repair the system + without /usr mounted (#276181) +- move vstp and libbrlttybba.so to brlapi +- brltty no longer requires brlapi +- brlapi now requires brltty from the same build + * Wed Oct 28 2009 Stepan Kasal - 4.1-1 - new upstream version - use --disable-stripping instead of make variable override @@ -243,6 +281,7 @@ exit 0 - remove the duplicate copies of rhmkboot and rhmkroot from docdir - patch configure so that the dirs in summary are not garbled: brltty-autoconf-quote.patch +- move data-directory to ${datadir}/brltty * Tue Oct 20 2009 Stepan Kasal - 4.0-2 - escape rpm macros in the rpm change log