Hello community, here is the log from the commit of package brltty for openSUSE:Factory checked in at 2013-06-25 17:13:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2013-03-24 21:56:06.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.brltty.new/brltty.changes 2013-06-25 17:13:25.000000000 +0200 @@ -1,0 +2,12 @@ +Tue Jun 25 09:20:12 UTC 2013 - tchva...@suse.com + +- Adjust the patch application to be same like with other patches. + +------------------------------------------------------------------- +Tue Jun 18 09:32:01 UTC 2013 - jeng...@inai.de + +- Add brltty-speechd.diff to avert packaging failure and take + into account changed speechd location. +- More robust make install call. Remove redundant %clean section. + +------------------------------------------------------------------- New: ---- brltty-speechd.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ brltty.spec ++++++ --- /var/tmp/diff_new_pack.zW3fjN/_old 2013-06-25 17:13:25.000000000 +0200 +++ /var/tmp/diff_new_pack.zW3fjN/_new 2013-06-25 17:13:25.000000000 +0200 @@ -33,6 +33,8 @@ License: GPL-2.0+ 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 @@ -40,6 +42,7 @@ Patch1: brltty-python-prefix.patch # PATCH-FIX-OPENSUSE brltty-java-jni-dir.patch vu...@opensuse.org -- Install java file in correct paths (openSUSE use %{_lib}) Patch2: brltty-java-jni-dir.patch +Patch3: brltty-speechd.diff BuildRequires: alsa-devel BuildRequires: at-spi-devel @@ -57,7 +60,7 @@ BuildRequires: jpackage-utils BuildRequires: libbraille-devel BuildRequires: libicu-devel -BuildRequires: libspeechd-devel +BuildRequires: libspeechd-devel >= 0.8 BuildRequires: libusb-1_0-devel BuildRequires: ncurses-devel %if %{with ocaml} @@ -305,6 +308,7 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build modified="$(sed -n '/^----/n;s/ - .*$//;p;q' "%{_sourcedir}/%{name}.changes")" @@ -321,7 +325,7 @@ %__make -j1 # not parallel build safe %install -%makeinstall +make install DESTDIR="%buildroot" install -D -m644 Documents/brltty.conf %{buildroot}%{_sysconfdir}/brltty.conf %{__rm} %{buildroot}%{_libdir}/libbrlapi.a %if %{with ocaml} @@ -347,9 +351,6 @@ %{__mkdir} -p %{buildroot}%{tcl_sitearch} %{__mv} %{buildroot}%{_libdir}/brlapi-%{api_version} %{buildroot}%{tcl_sitearch}/ -%clean -%{__rm} -rf %{buildroot} - %post -n libbrlapi0_5 -p /sbin/ldconfig %postun -n libbrlapi0_5 -p /sbin/ldconfig ++++++ brltty-speechd.diff ++++++ From: Jan Engelhardt <jeng...@inai.de> 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 @@ -38,7 +38,7 @@ typedef enum { #define SPK_HAVE_PUNCTUATION #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 @@ -17401,7 +17401,7 @@ then roots="/usr /usr/local /usr/local/speech-dispatcher /usr/local/speechd /opt/speech-dispatcher /opt/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: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
