diff --git a/brltty-3.7.2-yacc-buildfix.patch b/brltty-3.7.2-yacc-buildfix.patch new file mode 100644 index 0000000..a75828b --- /dev/null +++ b/brltty-3.7.2-yacc-buildfix.patch @@ -0,0 +1,11 @@ +--- brltty-3.7.2/BrailleDrivers/Papenmeier/config.y.yacc-buildfix 2005-12-26 13:57:44.000000000 +0100 ++++ brltty-3.7.2/BrailleDrivers/Papenmeier/config.y 2007-03-05 15:31:27.000000000 +0100 +@@ -41,7 +41,7 @@ + #define YYERROR_VERBOSE + static int yylex(void); + static int yyerror(char*); +-static int yyparse(); ++/*static*/ int yyparse(); + + /* to be called: */ + static int parse (void); diff --git a/brltty.spec b/brltty.spec index 66ecb2b..5ccc092 100644 --- a/brltty.spec +++ b/brltty.spec @@ -1,6 +1,6 @@ Name: brltty Version: 3.7.2 -Release: 2.1%{?dist} +Release: 3%{?dist} License: GPL Group: System Environment/Daemons URL: http://mielke.cc/brltty/ @@ -8,6 +8,7 @@ Source: http://mielke.cc/brltty/releases/%{name}-%{version}.tar.gz Patch0: brltty-3.7.2-linux-compiler-h.patch Patch1: brltty-3.7.2-vt-buildfix.patch Patch2: brltty-3.7.2-debuginfo.patch +Patch3: brltty-3.7.2-yacc-buildfix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-InstallRoot Summary: Braille display driver for Linux/Unix. Requires(post): coreutils @@ -21,6 +22,14 @@ It drives the braille display, and provides complete screen review functionality. Some speech capability has also been incorporated. +%package xw +Requires: %{name} +Summary: XWindow driver for BRLTTY. +Group: System Environment/Daemons +BuildRequires: libSM-devel libICE-devel libX11-devel libXaw-devel libXext-devel libXt-devel libXtst-devel +%description xw +This package provides the XWindow driver for BRLTTY. + %package -n brlapi Version: 0.4.1 Group: Applications/System @@ -57,6 +66,7 @@ which directly accesses a refreshable braille display. %patch0 -p1 -b .linux-compiler-h %patch1 -p1 -b .vt-buildfix %patch2 -p1 -b .debuginfo +%patch3 -p1 -b .yacc-buildfix %build %configure --with-install-root="${RPM_BUILD_ROOT}" --with-braille-driver=-tt @@ -73,6 +83,9 @@ make install #install-programs install-help install-tables install-drivers insta install -m 644 Documents/brltty.conf "${RPM_BUILD_ROOT}%{_sysconfdir}" rm -f ${RPM_BUILD_ROOT}/usr/bin/xbrlapi # whatever this is, we exclude it for now +ls ${RPM_BUILD_ROOT}/%{_libdir}/brltty/*.so | grep -v 'libbrlttybxw.so' | \ + sed -e "s|$RPM_BUILD_ROOT||" >libs.filelist + %clean rm -rf $RPM_BUILD_ROOT @@ -97,12 +110,12 @@ then fi exit 0 -%files +%files -f libs.filelist %defattr(-,root,root) %config(noreplace) /etc/brltty.conf %{_bindir}/brltty %{_bindir}/brltty-* -%{_libdir}/brltty +%dir %{_libdir}/brltty /etc/brltty %doc COPYING %doc Documents/ChangeLog Documents/TODO @@ -110,6 +123,9 @@ exit 0 %doc doc/* %doc /usr/share/man/man1/* +%files xw +%{_libdir}/brltty/libbrlttybxw.so + %files -n brlapi %defattr(-,root,root) %{_libdir}/libbrlapi.so.* @@ -124,7 +140,12 @@ exit 0 %doc %{_mandir}/man3/* %doc Documents/BrlAPIref-HTML + %changelog +* Mon Mar 05 2007 Tomas Janousek - 3.7.2-3 +- added the XWindow driver +- build fix for newer byacc + * Tue Jan 30 2007 Tomas Janousek - 3.7.2-2.1 - quiet postinstall scriptlet, really fixes #224570