Hello community, here is the log from the commit of package brltty for openSUSE:Factory checked in at 2014-03-20 07:03:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/brltty (Old) and /work/SRC/openSUSE:Factory/.brltty.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "brltty" Changes: -------- --- /work/SRC/openSUSE:Factory/brltty/brltty.changes 2014-01-13 10:52:41.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.brltty.new/brltty.changes 2014-03-20 07:03:59.000000000 +0100 @@ -1,0 +2,18 @@ +Sat Mar 1 21:27:25 UTC 2014 - [email protected] + +- Update to version 5.0 + + Too many changes; please read ChangeLog : + usr/share/doc/packages/brltty/ChangeLog +- Define a sover and soname macro for further easy API number changes +- Use download Url as source +- Remove brltty-java-jni-dir.patch and brltty-cppflags.patch; no longer + needed +- Add byacc and linux-glibc-devel requires; new upstream dependencies +- Replace pyrex with python-Cython build require; upstream change +- Create brlapi.key file; now needed to access to brlapi; fix rhbz#1010656 +- Create an associated user +- Add shadow dependency; needed to create user +- Adapt brltty-speechd.diff to upstream changes +- Add systemd support to allow users to start brltty at startup + +------------------------------------------------------------------- Old: ---- brltty-4.3.tar.gz brltty-cppflags.patch brltty-java-jni-dir.patch brltty-speechd.diff New: ---- brltty-5.0-speechd.diff brltty-5.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ brltty.spec ++++++ --- /var/tmp/diff_new_pack.AdGjBh/_old 2014-03-20 07:03:59.000000000 +0100 +++ /var/tmp/diff_new_pack.AdGjBh/_new 2014-03-20 07:03:59.000000000 +0100 @@ -18,7 +18,9 @@ %{!?tcl_version: %global tcl_version %(echo 'puts $tcl_version' | tclsh)} %{!?tcl_sitearch: %global tcl_sitearch %{_libdir}/tcl/tcl%{tcl_version}} -%define api_version 0.5.6 +%define api_version 0.6.1 +%define sover 0_6 +%define soname libbrlapi%{sover} %ifarch aarch64 %bcond_with ocaml %else @@ -26,7 +28,7 @@ %endif Name: brltty -Version: 4.3 +Version: 5.0 Release: 0 # FIXME libbraille driver when libbraille is in factory Summary: Braille display driver for Linux/Unix @@ -34,43 +36,38 @@ Group: System/Daemons Url: http://mielke.cc/brltty/ -#SVN-Clone: svn://mielke.cc/main/brltty -Source0: %{name}-%{version}.tar.gz -# PATCH-FIX-UPSTREAM brltty-cppflags.patch -- Taken from Fedora, to fix build of java bindings -Patch0: brltty-cppflags.patch +Source0: http://mielke.cc/brltty/archive/%{name}-%{version}.tar.xz # PATCH-FIX-UPSTREAM brltty-python-prefix.patch [email protected] -- Correctly install the python bindings Patch1: brltty-python-prefix.patch -# PATCH-FIX-OPENSUSE brltty-java-jni-dir.patch [email protected] -- Install java file in correct paths (openSUSE use %{_lib}) -Patch2: brltty-java-jni-dir.patch -Patch3: brltty-speechd.diff +Patch3: brltty-5.0-speechd.diff -BuildRequires: alsa-devel BuildRequires: bison -BuildRequires: bluez-devel -BuildRequires: dbus-1-devel +BuildRequires: byacc +BuildRequires: libbraille-devel +BuildRequires: linux-glibc-devel +BuildRequires: pkgconfig(alsa) +BuildRequires: pkgconfig(bluez) +BuildRequires: pkgconfig(dbus-1) BuildRequires: espeak-devel BuildRequires: fdupes -%if 0%{?suse_version} > 1130 BuildRequires: gpm-devel -%else -BuildRequires: gpm -%endif +BuildRequires: gettext BuildRequires: java-devel BuildRequires: jpackage-utils -BuildRequires: libbraille-devel -BuildRequires: libicu-devel -BuildRequires: libspeechd-devel >= 0.8 -BuildRequires: libusb-1_0-devel +BuildRequires: pkgconfig(speech-dispatcher) +BuildRequires: pkgconfig(icu-i18n) +BuildRequires: pkgconfig(libusb-1.0) BuildRequires: ncurses-devel %if %{with ocaml} BuildRequires: ocaml %endif -BuildRequires: pyrex +BuildRequires: pkg-config +BuildRequires: python-Cython BuildRequires: python-devel -# BuildRequires: subversion +BuildRequires: systemd-rpm-macros BuildRequires: tcl-devel BuildRequires: xorg-x11-devel -BuildRoot: %{_tmppath}/%{name}-%{version}-build +%{?systemd_requires} %description BRLTTY is a background process (daemon) which provides access to the @@ -96,7 +93,7 @@ Summary: BrlAPI driver for BRLTTY Group: System/Daemons Requires: %{name} = %{version} -Supplements: packageand(brltty:libbrlapi0_5) +Supplements: packageand(brltty:%{soname}) %description driver-brlapi BRLTTY is a background process (daemon) which provides access to the @@ -179,17 +176,18 @@ Summary: X BrlAPI helper Group: System/Daemons Requires: %{name} = %{version} -Supplements: packageand(libbrlapi0_5:xorg-x11-server) +Supplements: packageand(%{soname}:xorg-x11-server) %description -n xbrlapi The xbrlapi utility is a helper to have BrlAPI work on a X system. -%package -n libbrlapi0_5 +%package -n %{soname} Summary: Library to use BRLTTY from applications Group: System/Daemons +Requires(post): shadow Recommends: %{name} -%description -n libbrlapi0_5 +%description -n %{soname} BrlAPI is a service provided by the brltty daemon. Its purpose is to allow programmers to write applications that take @@ -204,7 +202,7 @@ %package -n brlapi-devel Summary: Library to use BRLTTY from applications -- Development Files Group: System/Daemons -Requires: libbrlapi0_5 = %{version} +Requires: %{soname} = %{version} %description -n brlapi-devel BrlAPI is a service provided by the brltty daemon. @@ -256,7 +254,6 @@ %package -n python-brlapi Summary: Library to use BRLTTY from applications -- Python Bindings Group: System/Daemons -%py_requires %description -n python-brlapi BrlAPI is a service provided by the brltty daemon. @@ -287,13 +284,16 @@ ignored, whereas each piece of data coming from the braille terminal is sent to the application, rather than to brltty. +%lang_package %prep %setup -q -%patch0 -p1 %patch1 -p1 -%patch2 -p1 %patch3 -p1 +sed -i "/#!.*/d" Tables/latex-access.ctb # Fix non-executable script warning +# Fix "wrong-file-end-of-line-encoding" rpmlint warning +sed -i 's/\r$//' Documents/Manual-BRLTTY/Portuguese/BRLTTY.txt +sed -i 's/\r$//' nsistrings.txt %build modified="$(sed -n '/^----/n;s/ - .*$//;p;q' "%{_sourcedir}/%{name}.changes")" @@ -310,7 +310,17 @@ %install make install DESTDIR="%buildroot" +%find_lang %{name} install -D -m644 Documents/brltty.conf %{buildroot}%{_sysconfdir}/brltty.conf +# ghost brlapi.key +touch %{buildroot}%{_sysconfdir}/brlapi.key +# Don't include source files in binary package +rm %{buildroot}%{_libdir}/ocaml/brlapi/brlapi.{mli,cmxa} +# Install systemd unit file +mkdir -p %{buildroot}%{_unitdir} +mkdir -p %{buildroot}%{_sbindir} +install -m644 Autostart/Systemd/%{name}.service %{buildroot}%{_unitdir} +ln -sf ../../%{_unitdir}/%{name}.service %{buildroot}%{_sbindir}/rc%{name} %{__rm} %{buildroot}%{_libdir}/libbrlapi.a %if %{with ocaml} %{__rm} %{buildroot}%{_libdir}/ocaml/brlapi/libbrlapi_stubs.a @@ -329,35 +339,64 @@ while read file; do mkdir -p doc/${file%/*} && cp -rp $file doc/$file || exit 1 done + +# disable xbrlapi gdm autostart, there is already orca +rm -f %{buildroot}%{_datadir}/gdm/greeter/autostart/xbrlapi.desktop + %fdupes -s %{buildroot}%{_mandir} +%fdupes -s # fix brp-tcl wrong location for Tcl files %{__mkdir} -p %{buildroot}%{tcl_sitearch} %{__mv} %{buildroot}%{_libdir}/brlapi-%{api_version} %{buildroot}%{tcl_sitearch}/ -%post -n libbrlapi0_5 -p /sbin/ldconfig -%postun -n libbrlapi0_5 -p /sbin/ldconfig +%pre -n %{soname} +getent group brlapi >/dev/null || groupadd -r brlapi >/dev/null + +%post +%service_add_post %{name}.service + +%post -n %{soname} +if [ ! -e %{_sysconfdir}/brlapi.key ]; then + mcookie > %{_sysconfdir}/brlapi.key + chgrp brlapi %{_sysconfdir}/brlapi.key + chmod 0640 %{_sysconfdir}/brlapi.key +fi +/sbin/ldconfig + +%preun +%service_del_preun %{name}.service + +%postun +%service_del_postun %{name}.service + +%postun -n %{soname} -p /sbin/ldconfig %files %defattr(-, root, root) %doc LICENSE-GPL LICENSE-LGPL README Documents/ChangeLog Documents/CONTRIBUTORS Documents/HISTORY Documents/README.Bluetooth Documents/TODO -%doc Documents/Manual-BRLTTY/ -%doc doc/* +%doc Documents/Manual-BRLTTY/English %config(noreplace) %{_sysconfdir}/brltty.conf %{_sysconfdir}/brltty/ %{_bindir}/brltty %{_bindir}/brltty-config +%{_bindir}/brltty-ctb %{_bindir}/brltty-install +%{_bindir}/brltty-trtxt +%{_bindir}/brltty-ttb +%{_bindir}/eutp %{_libdir}/brltty/ -%doc %{_mandir}/man1/brltty.1* +%{_mandir}/man1/brltty.1* +%{_mandir}/man1/eutp.1.gz +%{_sbindir}/rc%{name} +%{_unitdir}/%{name}.service %exclude %{_libdir}/brltty/libbrlttybba.so %exclude %{_libdir}/brltty/libbrlttyblb.so %exclude %{_libdir}/brltty/libbrlttybxw.so %exclude %{_libdir}/brltty/libbrlttyses.so %exclude %{_libdir}/brltty/libbrlttyssd.so %exclude %{_libdir}/brltty/libbrlttyxa2.so -%exclude %{_libdir}/brltty/libbrlttyxas.so %files driver-at-spi2 %defattr(-, root, root) @@ -390,17 +429,18 @@ %files utils %defattr(-, root, root) %{_bindir}/vstp -%doc %{_mandir}/man1/vstp.1* +%{_mandir}/man1/vstp.1* %files -n xbrlapi %defattr(-, root, root) %{_bindir}/xbrlapi -%doc %{_mandir}/man1/xbrlapi.1* +%{_mandir}/man1/xbrlapi.1* -%files -n libbrlapi0_5 +%files -n %{soname} %defattr(-, root, root) %doc Documents/Manual-BrlAPI/ %{_libdir}/libbrlapi.so.* +%ghost %{_sysconfdir}/brlapi.key %files -n brlapi-devel %defattr(-, root, root) @@ -431,4 +471,9 @@ %defattr(-, root, root) %{tcl_sitearch}/brlapi-%{api_version}/ +%files lang -f %{name}.lang +%defattr(-, root, root) +%doc Documents/Manual-BRLTTY/French +%doc Documents/Manual-BRLTTY/Portuguese + %changelog ++++++ brltty-5.0-speechd.diff ++++++ From: Jan Engelhardt <[email protected]> Date: 2013-06-18 11:27:55.105668872 +0200 speech-dispatcher-0.8 moved speechd.h from /usr/include to /usr/include/speech-dispatcher. This patch is not really for upstream; the proper way to use speech-dispatcher is by way of pkg-config. This here is just a quick way to get it building in openSUSE again. --- Drivers/Speech/SpeechDispatcher/speech.c | 2 +- configure | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) Index: brltty-4.3/Drivers/Speech/SpeechDispatcher/speech.c =================================================================== --- brltty-4.3.orig/Drivers/Speech/SpeechDispatcher/speech.c +++ brltty-4.3/Drivers/Speech/SpeechDispatcher/speech.c @@ -34,7 +34,7 @@ typedef enum { #include "spk_driver.h" -#include <libspeechd.h> +#include <speech-dispatcher/libspeechd.h> static SPDConnection *connectionHandle = NULL; static const char *moduleName; Index: brltty-4.3/configure =================================================================== --- brltty-4.3.orig/configure +++ brltty-4.3/configure @@ -13484,7 +13484,7 @@ roots="/usr /usr/local /usr/local/speech-dispatcher /usr/local/speechd /opt/speech-dispatcher /opt/speechd /mingw /mingw/speech-dispatcher /mingw/speechd" for root in ${roots} do - if test -f "${root}/include/libspeechd.h" + if test -f "${root}/include/speech-dispatcher/libspeechd.h" then speechd_root="${root}" break -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
