commit speech-dispatcher for openSUSE:Factory

22 Apr 2010

Hello community,

here is the log from the commit of package speech-dispatcher for openSUSE:Factory
checked in at Fri Apr 23 01:40:27 CEST 2010.



--------
New Changes file:

--- /dev/null	2010-04-12 17:03:46.000000000 +0200
+++ /mounts/work_src_done/STABLE/speech-dispatcher/speech-dispatcher.changes	2010-04-08 17:57:57.000000000 +0200
@@ -0,0 +1,97 @@
+-------------------------------------------------------------------
+Wed Apr  7 16:14:39 CEST 2010 - vuntz@opensuse.org
+
+- Completely rework the package, based on the Fedora and Debian
+  packages.
+- Rename the source package to speech-dispatcher, to follow
+  upstream name.
+
+-------------------------------------------------------------------
+Sun Jan 31 10:24:11 CET 2010 - lnussel@suse.de
+
+- don't enable daemon by default
+
+-------------------------------------------------------------------
+Tue Sep  1 09:30:16 CEST 2009 - coolo@novell.com
+
+- again: use new python macros
+
+--------------------------------------------------------------------
+Wed Aug 19 20:30:03 CEST 2009 - marco@suse.de
+
+- speechd.spec: using py_sitedir instead of python_sitelib
+
+--------------------------------------------------------------------
+Tue Aug 18 23:49:17 CEST 2009 - marco@suse.de
+
+- added build options for espeak support
+- --with-pulse --with-espeak
+- buildrequirements espeak-devel and pulseaudio-devel
+
+-------------------------------------------------------------------
+Sun Aug  9 08:40:43 CEST 2009 - coolo@novell.com
+
+- use new python macros
+
+-------------------------------------------------------------------
+Mon Jun  8 00:10:50 CEST 2009 - ro@suse.de
+
+- adapt getline definition to glibc
+
+-------------------------------------------------------------------
+Thu Mar 26 13:11:21 CET 2009 - crrodriguez@suse.de
+
+- remove static libraries and "la" files 
+
+-------------------------------------------------------------------
+Mon Sep 29 12:19:52 CEST 2008 - marco@suse.de
+
+- fixed start-script (bug#430563) 
+
+-------------------------------------------------------------------
+Tue Sep 16 23:40:08 CEST 2008 - dmueller@suse.de
+
+- move python requires to python subpackage
+- fix requires
+
+-------------------------------------------------------------------
+Mon Sep 15 16:08:29 CEST 2008 - dmueller@suse.de
+
+- fix filelist
+
+--------------------------------------------------------------------
+Sun Sep 14 03:39:23 CEST 2008 - marco@suse.de
+
+- added devel section to spec-file
+- added suse_python patch to insert start-script
+  and to use DESTDIR in the python-bindings makefile
+
+--------------------------------------------------------------------
+Thu Sep 11 02:50:06 CEST 2008 - marco@suse.de
+
+- updated to 0.6.7
+--------------------------------------------------------------------
+Fri Feb 22 13:28:38 CET 2008 - marco@suse.de
+
+- modified the default config to work with espeak by default
+
+--------------------------------------------------------------------
+Fri Feb 22 13:27:04 CET 2008 - marco@suse.de
+
+- added section in spec file for speechd-python
+- modified makefile for python-bindings (added DESTDIR)
+
+--------------------------------------------------------------------
+Fri Feb 15 15:27:58 CET 2008 - marco@suse.de
+
+- updated to version 0.6.6
+- added a suse init-script /etc/init.d/speechd
+- added the link /usr/sbin/rcspeechd
+
+-------------------------------------------------------------------
+Wed Oct 31 01:54:38 CET 2007 - ro@suse.de
+
+- include assert for alsa source
+
+
+

calling whatdependson for head-i586


New:
----
  speech-dispatcher-0.6.7.tar.bz2
  speech-dispatcher.changes
  speech-dispatcher.init
  speech-dispatcher.logrotate
  speech-dispatcher.spec
  speech-dispatcher_extlink.patch
  speech-dispatcher_getline.patch
  speech-dispatcher_libspeechd.patch
  speech-dispatcher_paths+files.patch
  speech-dispatcher_python-makefile.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ speech-dispatcher.spec ++++++
#
# spec file for package speech-dispatcher (Version 0.6.7)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.

# Please submit bugfixes or comments via http://bugs.opensuse.org/
#



Name:           speech-dispatcher
Version:        0.6.7
Release:        1
# FIXME missing backends: festival lite, ibmeci (ibm tts), dumbtts/ivona, nas
# Almost all files are under GPLv2+, however src/c/clients/spdsend/spdsend.h is
# licensed under GPLv2, which makes %%{_bindir}/spdsend GPLv2.
License:        GPLv2+
Summary:        Device independent layer for speech synthesis
Group:          System/Daemons
Url:            http://www.freebsoft.org/pub/projects/speechd/
Source0:        %{name}-%{version}.tar.bz2
# Init file
Source1:        speech-dispatcher.init
# Logrotate file taken from Debian
Source2:        speech-dispatcher.logrotate
# PATCH-FIX-UPSTREAM speech-dispatcher_python-makefile.patch vuntz@opensuse.org -- Taken from Debian, fix installation of python files
Patch0:         speech-dispatcher_python-makefile.patch
# PATCH-FIX-UPSTREAM speech-dispatcher_paths+files.patch vuntz@opensuse.org -- Taken from Debian, use `speech-dispatcher' instead of `speechd' in paths
Patch1:         speech-dispatcher_paths+files.patch
# PATCH-FIX-UPSTREAM speech-dispatcher_getline.patch vuntz@opensuse.org -- Taken from Debian, fix conflict with glibc
Patch2:         speech-dispatcher_getline.patch
# PATCH-FIX-UPSTREAM speech-dispatcher_libspeechd.patch vuntz@opensuse.org -- Taken from Debian, plug socket leak
Patch3:         speech-dispatcher_libspeechd.patch
# PATCH-FIX-UPSTREAM speech-dispatcher_extlink.patch vuntz@opensuse.org -- Taken from Debian, link to pthread
Patch4:         speech-dispatcher_extlink.patch
BuildRequires:  alsa-devel
BuildRequires:  dotconf-devel
BuildRequires:  espeak-devel
BuildRequires:  glib2-devel
BuildRequires:  libpulse-devel
BuildRequires:  libsndfile-devel
BuildRequires:  python-setuptools
BuildRequires:  texinfo
PreReq:         %install_info_prereq
Recommends:     espeak
Suggests:       festival
Suggests:       logrotate
Provides:       speechd = %{version}
Obsoletes:      speechd < %{version}
BuildRoot:      %{_tmppath}/%{name}-%{version}-build

%description
The goal of Speech Dispatcher project is to provide a high-level device
independent layer for speech synthesis through a simple, stable and
well documented interface.

What is a very high level GUI library to graphics, Speech Dispatcher is
to speech synthesis. The application neither needs to talk to the
devices directly nor to handle concurrent access, sound output and other
tricky aspects of the speech subsystem.

%package configure
License:        GPLv2+
Summary:        Configuration tool for Speech Dispatcher
Group:          System/Daemons
Requires:       %{name} = %{version}
Enhances:       %{name}
# spd-conf is in python
%py_requires

%description configure
The goal of Speech Dispatcher project is to provide a high-level device
independent layer for speech synthesis through a simple, stable and
well documented interface.

What is a very high level GUI library to graphics, Speech Dispatcher is
to speech synthesis. The application neither needs to talk to the
devices directly nor to handle concurrent access, sound output and other
tricky aspects of the speech subsystem.

This package contains spd-conf, a configuration tool for Speech
Dispatcher.

%package module-espeak
License:        GPLv2+
Summary:        ESpeak module for Speech Dispatcher
Group:          System/Daemons
Requires:       %{name} = %{version}
Supplements:    packageand(%{name}:espeak)

%description module-espeak
The goal of Speech Dispatcher project is to provide a high-level device
independent layer for speech synthesis through a simple, stable and
well documented interface.

What is a very high level GUI library to graphics, Speech Dispatcher is
to speech synthesis. The application neither needs to talk to the
devices directly nor to handle concurrent access, sound output and other
tricky aspects of the speech subsystem.

This package contains the espeak module.

%package -n libspeechd2
License:        GPLv2+
Summary:        Device independent layer for speech synthesis - Client library
Group:          System/Libraries
Recommends:     %{name}

%description -n libspeechd2
The goal of Speech Dispatcher project is to provide a high-level device
independent layer for speech synthesis through a simple, stable and
well documented interface.

What is a very high level GUI library to graphics, Speech Dispatcher is
to speech synthesis. The application neither needs to talk to the
devices directly nor to handle concurrent access, sound output and other
tricky aspects of the speech subsystem.

%package -n libspeechd-devel
License:        GPLv2+
Summary:        Device independent layer for speech synthesis - Development files
Group:          Development/Languages/C and C++
Requires:       libspeechd2 = %{version}
Provides:       %{name}-devel = %{version}
Provides:       speechd-devel = %{version}
Obsoletes:      speechd-devel < %{version}

%description -n libspeechd-devel
The goal of Speech Dispatcher project is to provide a high-level device
independent layer for speech synthesis through a simple, stable and
well documented interface.

What is a very high level GUI library to graphics, Speech Dispatcher is
to speech synthesis. The application neither needs to talk to the
devices directly nor to handle concurrent access, sound output and other
tricky aspects of the speech subsystem.

%package -n python-speechd
License:        GPLv2+
Summary:        Device independent layer for speech synthesis - Python Bindings
Group:          Development/Libraries/Python
Recommends:     %{name}
Provides:       speechd-python = %{version}
Obsoletes:      speechd-python < %{version}
%py_requires

%description -n python-speechd
The goal of Speech Dispatcher project is to provide a high-level device
independent layer for speech synthesis through a simple, stable and
well documented interface.

What is a very high level GUI library to graphics, Speech Dispatcher is
to speech synthesis. The application neither needs to talk to the
devices directly nor to handle concurrent access, sound output and other
tricky aspects of the speech subsystem.

%prep
%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1

%build
%configure --disable-static \
        --with-alsa \
        --with-pulse \
        --without-flite \
        --sysconfdir=%{_sysconfdir}
make %{?jobs:-j%jobs}

%install
%makeinstall
find %{buildroot} -type f -name "*.la" -delete -print
# Create init.d files
install -D -m 0755 %{SOURCE1} %{buildroot}%{_sysconfdir}/init.d/speech-dispatcher
install -d -m 0755 %{buildroot}%{_sbindir}
ln -s %{_sysconfdir}/init.d/speech-dispatcher %{buildroot}%{_sbindir}/rcspeech-dispatcher
# Create log dir. 0700 since the logs can contain user information.
install -d -m 0700 %{buildroot}%{_localstatedir}/log/speech-dispatcher/
# Install logrotate script
install -D -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/logrotate.d/speech-dispatcher
# Rename certain generically named binaries
mv %{buildroot}%{_bindir}/long_message %{buildroot}%{_bindir}/spd_long_message
mv %{buildroot}%{_bindir}/run_test %{buildroot}%{_bindir}/spd_run_test
# Remove config files for modules we don't support
%{__rm} %{buildroot}%{_sysconfdir}/speech-dispatcher/modules/flite.conf
%{__rm} %{buildroot}%{_sysconfdir}/speech-dispatcher/modules/ibmtts.conf
%{__rm} %{buildroot}%{_sysconfdir}/speech-dispatcher/modules/ivona.conf
# Remove config files that we don't need a second time
%{__rm} -r %{buildroot}%{_datadir}/speech-dispatcher/conf/
# Remove %{_infodir}/dir file and the one translation of the doc
%{__rm} %{buildroot}%{_infodir}/dir
%{__rm} %{buildroot}%{_infodir}/%{name}-cs.info

%clean
rm -rf %{buildroot}

%post
%install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz
%install_info --info-dir=%{_infodir} %{_infodir}/spd-say.info.gz
%install_info --info-dir=%{_infodir} %{_infodir}/ssip.info.gz

%preun
%stop_on_removal speech-dispatcher

%postun
%install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz
%install_info_delete --info-dir=%{_infodir} %{_infodir}/spd-say.info.gz
%install_info_delete --info-dir=%{_infodir} %{_infodir}/ssip.info.gz
%restart_on_update speech-dispatcher
%insserv_cleanup

%post -n libspeechd2 -p /sbin/ldconfig

%postun -n libspeechd2 -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog NEWS README TODO COPYING
%dir %{_sysconfdir}/speech-dispatcher/
%dir %{_sysconfdir}/speech-dispatcher/clients
%dir %{_sysconfdir}/speech-dispatcher/modules
%config(noreplace) %{_sysconfdir}/speech-dispatcher/speechd.conf
%config(noreplace) %{_sysconfdir}/speech-dispatcher/clients/*.conf
%config(noreplace) %{_sysconfdir}/speech-dispatcher/modules/*.conf
%exclude %{_sysconfdir}/speech-dispatcher/modules/espeak.conf
%{_bindir}/*
%exclude %{_bindir}/spd-conf
%{_datadir}/sounds/speech-dispatcher/
%dir %{_libdir}/speech-dispatcher
%{_libdir}/speech-dispatcher/libsdaudio.so*
# When adding a module, also strop removing its config file in %install
%dir %{_libdir}/speech-dispatcher-modules
%{_libdir}/speech-dispatcher-modules/sd_cicero
%{_libdir}/speech-dispatcher-modules/sd_dummy
%{_libdir}/speech-dispatcher-modules/sd_festival
%{_libdir}/speech-dispatcher-modules/sd_generic
%doc %{_infodir}/%{name}.info.gz
%doc %{_infodir}/spd-say.info.gz
%doc %{_infodir}/ssip.info.gz
# logs
%dir %attr(0700, root, root) %{_localstatedir}/log/speech-dispatcher/
%config(noreplace) %{_sysconfdir}/logrotate.d/speech-dispatcher
# init.d files
%config %{_sysconfdir}/init.d/speech-dispatcher
%{_sbindir}/rcspeech-dispatcher

%files configure
%defattr(-,root,root,-)
%{_bindir}/spd-conf
%{python_sitelib}/speechd_config/
%{python_sitelib}/speechd_config-*.egg-info

%files module-espeak
%defattr(-,root,root,-)
%config(noreplace) %{_sysconfdir}/speech-dispatcher/modules/espeak.conf
%{_libdir}/speech-dispatcher-modules/sd_espeak

%files -n libspeechd2
%defattr(-,root,root,-)
%{_libdir}/libspeechd.so.*

%files -n libspeechd-devel
%defattr(-,root,root,-)
%{_includedir}/libspeechd.h
%{_libdir}/*.so

%files -n python-speechd
%defattr(-,root,root,-)
%{python_sitelib}/speechd/
%{python_sitelib}/speechd-*.egg-info

%changelog
++++++ speech-dispatcher.init ++++++
#! /bin/sh

### BEGIN INIT INFO
# Provides:          speech-dispatcher
# Required-Start:    $remote_fs
# Should-Start:      festival
# Required-Stop:     $remote_fs
# Should-Stop:       festival
# Default-Start:     2 3 5
# Default-Stop:      0 1 6
# Description:       Common interface to speech synthesizers
# Short-Description: Speech Dispatcher
### END INIT INFO


# Note on runlevels: 
# 0 - halt/poweroff                     6 - reboot
# 1 - single user                       2 - multiuser without network exported
# 3 - multiuser w/ network (text mode)  5 - multiuser w/ network and X11 (xdm)
# 
# Note on script names:
# http://www.linuxbase.org/spec/refspecs/LSB_1.2.0/gLSB/scrptnames.html
# A registry has been set up to manage the init script namespace.
# http://www.lanana.org/
# Please use the names already registered or register one or use a
# vendor prefix.


# Check for missing binaries (stale symlinks should not happen)
SPEECH_DISPATCHER_BIN=/usr/bin/speech-dispatcher
test -x $SPEECH_DISPATCHER_BIN || exit 5

# Source LSB init functions
# providing start_daemon, killproc, pidofproc, 
# log_success_msg, log_failure_msg and log_warning_msg.
# This is currently not used by UnitedLinux based distributions and
# not needed for init scripts for UnitedLinux only. If it is used,
# the functions from rc.status should not be sourced or used.
#. /lib/lsb/init-functions

# Shell functions sourced from /etc/rc.status:
#      rc_check         check and set local and overall rc status
#      rc_status        check and set local and overall rc status
#      rc_status -v     be verbose in local rc status and clear it afterwards
#      rc_status -v -r  ditto and clear both the local and overall rc status
#      rc_status -s     display "skipped" and exit with status 3
#      rc_status -u     display "unused" and exit with status 3
#      rc_failed        set local and overall rc status to failed
#      rc_failed <num>  set local and overall rc status to <num>
#      rc_reset         clear both the local and overall rc status
#      rc_exit          exit appropriate to overall rc status
#      rc_active        checks whether a service is activated by symlinks
#      rc_splash arg    sets the boot splash screen to arg (if active)
. /etc/rc.status

# Reset status of this service
rc_reset

# Return values acc. to LSB for all commands but status:
# 0       - success
# 1       - generic or unspecified error
# 2       - invalid or excess argument(s)
# 3       - unimplemented feature (e.g. "reload")
# 4       - user had insufficient privileges
# 5       - program is not installed
# 6       - program is not configured
# 7       - program is not running
# 8--199  - reserved (8--99 LSB, 100--149 distrib, 150--199 appl)
# 
# Note that starting an already running service, stopping
# or restarting a not-running service as well as the restart
# with force-reload (in case signaling is not supported) are
# considered a success.

case "$1" in
    start)
        echo -n "Starting speech dispatcher "
        ## Start daemon with startproc(8). If this fails
        ## the return value is set appropriately by startproc.
        startproc -q -e $SPEECH_DISPATCHER_BIN

        # Remember status and be verbose
        rc_status -v
        ;;
    stop)
        echo -n "Shutting down speech dispatcher "
        ## Stop daemon with killproc(8) and if this fails
        ## killproc sets the return value according to LSB.
        killproc -TERM $SPEECH_DISPATCHER_BIN

        # Remember status and be verbose
        rc_status -v
        ;;
    try-restart)
        ## Do a restart only if the service was active before.
        ## Note: try-restart is not (yet) part of LSB (as of 1.2)
        $0 status >/dev/null &&  $0 restart

        # Remember status and be quiet
        rc_status
        ;;
    restart)
        ## Stop the service and regardless of whether it was
        ## running or not, start it again.
        $0 stop
        $0 start

        # Remember status and be quiet
        rc_status
        ;;
    reload|force-reload)

        echo -n "Reload speech dispatcher "
        $0 stop  &&  $0 start
        #rc_status
        ;;
    status)
        echo -n "Checking for speech dispatcher "
        ## Check status with checkproc(8), if process is running
        ## checkproc will return with exit status 0.

        # Return value is slightly different for the status command:
        # 0 - service up and running
        # 1 - service dead, but /var/run/  pid  file exists
        # 2 - service dead, but /var/lock/ lock file exists
        # 3 - service not running (unused)
        # 4 - service status unknown :-(
        # 5--199 reserved (5--99 LSB, 100--149 distro, 150--199 appl.)

        # NOTE: checkproc returns LSB compliant status values.
        checkproc $SPEECH_DISPATCHER_BIN
        # NOTE: rc_status knows that we called this init script with
        # "status" option and adapts its messages accordingly.
        rc_status -v
        ;;
    *)
        echo "Usage: $0 {start|stop|status|try-restart|restart|relaod|force-reload}"
        exit 1
        ;;
esac
rc_exit
++++++ speech-dispatcher.logrotate ++++++
daily
compress
missingok
sharedscripts

/var/log/speech-dispatcher/speech-dispatcher.log /var/log/speech-dispatcher/speech-dispatcher-protocol.log {
  rotate 7
  postrotate
    /etc/init.d/speech-dispatcher reload >/dev/null
  endscript
}

/var/log/speech-dispatcher/debug-epos-generic /var/log/speech-dispatcher/debug-festival /var/log/speech-dispatcher/debug-flite {
  rotate 2
  postrotate
    /etc/init.d/speech-dispatcher reload >/dev/null
  endscript
}
++++++ speech-dispatcher_extlink.patch ++++++
#! /bin/sh /usr/share/dpatch/dpatch-run
## 06_extlink.dpatch by Milan Zamazal <pdm@debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Make binutils-gold happy.

@DPATCH@
diff -urNad speech-dispatcher~/src/c/clients/say/Makefile.am speech-dispatcher/src/c/clients/say/Makefile.am
--- speech-dispatcher~/src/c/clients/say/Makefile.am	2009-11-23 13:28:39.000000000 +0100
+++ speech-dispatcher/src/c/clients/say/Makefile.am	2010-01-04 14:58:23.000000000 +0100
@@ -7,4 +7,4 @@
 
 bin_PROGRAMS = spd-say
 spd_say_SOURCES = say.c options.c options.h $(c_api)/libspeechd.h
-spd_say_LDADD = $(c_api)/libspeechd.la
+spd_say_LDADD = $(c_api)/libspeechd.la -lpthread
diff -urNad speech-dispatcher~/src/tests/Makefile.am speech-dispatcher/src/tests/Makefile.am
--- speech-dispatcher~/src/tests/Makefile.am	2008-04-09 13:39:39.000000000 +0200
+++ speech-dispatcher/src/tests/Makefile.am	2010-01-04 14:59:44.000000000 +0100
@@ -8,18 +8,18 @@
 bin_PROGRAMS = long_message clibrary clibrary2 run_test connection_recovery
 
 long_message_SOURCES = long_message.c $(c_api)/libspeechd.h
-long_message_LDADD = $(c_api)/libspeechd.la
+long_message_LDADD = $(c_api)/libspeechd.la -lpthread
 
 clibrary_SOURCES = clibrary.c $(c_api)/libspeechd.h
-clibrary_LDADD = $(c_api)/libspeechd.la
+clibrary_LDADD = $(c_api)/libspeechd.la -lpthread
 
 clibrary2_SOURCES = clibrary2.c $(c_api)/libspeechd.h
-clibrary2_LDADD = $(c_api)/libspeechd.la
+clibrary2_LDADD = $(c_api)/libspeechd.la -lpthread
 
 connection_recovery_SOURCES = connection-recovery.c $(c_api)/libspeechd.h
-connection_recovery_LDADD = $(c_api)/libspeechd.la
+connection_recovery_LDADD = $(c_api)/libspeechd.la -lpthread
 
 run_test_SOURCES = run_test.c $(c_api)/libspeechd.h
-run_test_LDADD = $(c_api)/libspeechd.la
+run_test_LDADD = $(c_api)/libspeechd.la -lpthread
 
 EXTRA_DIST= *.test *.wav
++++++ speech-dispatcher_getline.patch ++++++
#! /bin/sh /usr/share/dpatch/dpatch-run
## 04_getline.dpatch by Milan Zamazal <pdm@debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Prevent FTBS with eglibc >= 2.10.
## DP: Patch from Luke Yelavich's unofficial Speech Dispatcher repository (http://git.themuso.com).

@DPATCH@
diff -urNad speech-dispatcher~/src/modules/Makefile.am speech-dispatcher/src/modules/Makefile.am
--- speech-dispatcher~/src/modules/Makefile.am	2009-11-02 10:17:27.000000000 +0100
+++ speech-dispatcher/src/modules/Makefile.am	2009-11-02 10:19:27.000000000 +0100
@@ -7,7 +7,7 @@
 
 EXTRA_DIST = module_main.c module_utils_addvoice.c festival_client.c festival_client.h ivona_client.c dummy.c dummy-message.wav
 
-AM_CFLAGS = -Wall -DLOCALEDIR=\"$(localedir)\" -DDATADIR=\"$(snddatadir)\" -I/usr/include/ $(inc_local) @glib_include@ -L$(top_srcdir)/src/audio -I$(top_srcdir)/src/audio -I../../intl/ $(ibmtts_include) @SNDFILE_CFLAGS@ -Wl,--rpath -Wl,$(spdlibdir)
+AM_CFLAGS = -Wall -DLOCALEDIR=\"$(localedir)\" -DDATADIR=\"$(snddatadir)\" -I/usr/include/ $(inc_local) @glib_include@ -L$(top_srcdir)/src/audio -I$(top_srcdir)/src/audio -I../../intl/ $(ibmtts_include) @SNDFILE_CFLAGS@ -Wl,--rpath -Wl,$(spdlibdir) -D_GNU_SOURCE
 
 modulebin_PROGRAMS = sd_dummy sd_generic sd_festival sd_cicero
 
diff -urNad speech-dispatcher~/src/modules/module_main.c speech-dispatcher/src/modules/module_main.c
--- speech-dispatcher~/src/modules/module_main.c	2009-11-02 10:17:27.000000000 +0100
+++ speech-dispatcher/src/modules/module_main.c	2009-11-02 10:19:27.000000000 +0100
@@ -21,9 +21,6 @@
  * $Id: module_main.c,v 1.16 2008-06-27 12:29:26 hanke Exp $
  */
 
-/* So that gcc doesn't comply */
-int getline(char**, size_t*, FILE*);
-
 #define PROCESS_CMD(command, function) \
 if (!strcmp(cmd_buf, #command"\n")){ \
  char *msg; \
diff -urNad speech-dispatcher~/src/modules/module_utils.h speech-dispatcher/src/modules/module_utils.h
--- speech-dispatcher~/src/modules/module_utils.h	2009-11-02 10:17:27.000000000 +0100
+++ speech-dispatcher/src/modules/module_utils.h	2009-11-02 10:19:27.000000000 +0100
@@ -420,9 +420,6 @@
 
 
 
-/* So that gcc doesn't complain */
-int getline(char**, size_t*, FILE*);
-
 pthread_mutex_t module_stdout_mutex;
 
 int module_utils_init(void);
++++++ speech-dispatcher_libspeechd.patch ++++++
#! /bin/sh /usr/share/dpatch/dpatch-run
## 05_libspeechd.dpatch by  <pdm@debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: No description.

@DPATCH@
diff -urNad speech-dispatcher~/src/c/api/libspeechd.c speech-dispatcher/src/c/api/libspeechd.c
--- speech-dispatcher~/src/c/api/libspeechd.c	2009-11-02 14:10:09.000000000 +0100
+++ speech-dispatcher/src/c/api/libspeechd.c	2009-11-02 14:11:20.000000000 +0100
@@ -134,6 +134,7 @@
     ret = connect(connection->socket, (struct sockaddr *)&address, sizeof(address));
     if (ret == -1){
         SPD_DBG("Error: Can't connect to server: %s", strerror(errno));
+        close(connection->socket);
 	return NULL;
     }
 
++++++ speech-dispatcher_paths+files.patch ++++++
#! /bin/sh /usr/share/dpatch/dpatch-run
## 03_paths+files.dpatch by  <pdm@debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Use `speech-dispatcher' instead of `speechd' in paths.

@DPATCH@
diff -urNad speech-dispatcher~/config/speechd.conf.in speech-dispatcher/config/speechd.conf.in
--- speech-dispatcher~/config/speechd.conf.in	2008-08-05 09:34:20.000000000 +0200
+++ speech-dispatcher/config/speechd.conf.in	2008-10-24 19:48:19.000000000 +0200
@@ -43,7 +43,7 @@
 # The CustomLogFile allows logging all messages of the given kind,
 # regardless their priority, to the given destination.
 
-#CustomLogFile "protocol" "/var/log/speech-dispatcher/speechd-protocol.log"
+#CustomLogFile "protocol" "/var/log/speech-dispatcher/speech-dispatcher-protocol.log"
 
 # ----- VOICE PARAMETERS -----
 
@@ -69,7 +69,7 @@
 # default.  Voice types are symbolic names which map to particular
 # voices provided by the synthesizer according to the output module
 # configuratuion.  Please see the synthesizer-specific configuration
-# in etc/speechd/modules/ to see which voices are assigned to
+# in etc/speech-dispatcher/modules/ to see which voices are assigned to
 # different symbolic names.  The following symbolic names are
 # currently supported: MALE1, MALE2, MALE3, FEMALE1, FEMALE2, FEMALE3,
 # CHILD_MALE, CHILD_FEMALE
@@ -203,7 +203,7 @@
 #  - binary is the path to the binary executable of this module,
 #    either relative (to lib/speech-dispatcher-modules/) or absolute
 #  - configuration is the path to the config file of this module,
-#    either relative (to etc/speechd/modules/) or absolute
+#    either relative (to etc/speech-dispatcher/modules/) or absolute
 
 AddModule "espeak"       "sd_espeak"   "espeak.conf"
 AddModule "festival"     "sd_festival"  "festival.conf"
diff -urNad speech-dispatcher~/doc/speech-dispatcher.texi speech-dispatcher/doc/speech-dispatcher.texi
--- speech-dispatcher~/doc/speech-dispatcher.texi	2008-08-04 21:26:29.000000000 +0200
+++ speech-dispatcher/doc/speech-dispatcher.texi	2008-10-24 19:50:05.000000000 +0200
@@ -807,8 +807,8 @@
 
 @item
 Check the appropriate logfile in
-@file{~/.speech-dispatcher/logs/speechd.log} for user Speech
-Dispatcher or in @file{/var/log/speech-dispatcher/speechd.log}. Look
+@file{~/.speech-dispatcher/logs/speech-dispatcher.log} for user Speech
+Dispatcher or in @file{/var/log/speech-dispatcher/speech-dispatcher.log}. Look
 for lines containing the string 'ERROR' and their surrounding
 contents. If you hear no speech, restart Speech Dispatcher and look
 near the end of the log file -- before any attempts for synthesis of
diff -urNad speech-dispatcher~/src/server/options.c speech-dispatcher/src/server/options.c
--- speech-dispatcher~/src/server/options.c	2008-07-10 17:35:56.000000000 +0200
+++ speech-dispatcher/src/server/options.c	2008-10-24 19:50:16.000000000 +0200
@@ -139,7 +139,7 @@
 	    exit(1);
 	  }
 	    
-	  debug_logfile_path = g_strdup_printf("%s/speechd.log",
+	  debug_logfile_path = g_strdup_printf("%s/speech-dispatcher.log",
 					       SpeechdOptions.debug_destination);
 	  /* Open logfile for writing */
 	  debug_logfile = fopen(debug_logfile_path, "wx");
diff -urNad speech-dispatcher~/src/server/set.c speech-dispatcher/src/server/set.c
--- speech-dispatcher~/src/server/set.c	2008-07-01 11:00:32.000000000 +0200
+++ speech-dispatcher/src/server/set.c	2008-10-24 19:50:03.000000000 +0200
@@ -380,7 +380,7 @@
   if (!SpeechdOptions.debug && !debug) return 1;
  
   if (debug){
-    debug_logfile_path = g_strdup_printf("%s/speechd.log", SpeechdOptions.debug_destination);
+    debug_logfile_path = g_strdup_printf("%s/speech-dispatcher.log", SpeechdOptions.debug_destination);
 
     debug_logfile = fopen(debug_logfile_path, "w");
     if (debug_logfile == NULL){
diff -urNad speech-dispatcher~/src/server/speechd.c speech-dispatcher/src/server/speechd.c
--- speech-dispatcher~/src/server/speechd.c	2008-07-10 17:36:49.000000000 +0200
+++ speech-dispatcher/src/server/speechd.c	2008-10-24 19:49:59.000000000 +0200
@@ -714,7 +714,7 @@
 void
 logging_init(void)
 {
-  char *file_name = g_strdup_printf("%s/speechd.log", SpeechdOptions.log_dir);    
+  char *file_name = g_strdup_printf("%s/speech-dispatcher.log", SpeechdOptions.log_dir);    
   assert(file_name != NULL);
   if (!strncmp(file_name,"stdout",6)){
     logfile = stdout;
++++++ speech-dispatcher_python-makefile.patch ++++++
#! /bin/sh /usr/share/dpatch/dpatch-run
## 02_python-makefile.dpatch by  <pdm@debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Don't compile Python files.  Fix path settings.

@DPATCH@
diff -urNad speech-dispatcher~/src/python/Makefile.in speech-dispatcher/src/python/Makefile.in
--- speech-dispatcher~/src/python/Makefile.in	2009-11-02 14:02:46.000000000 +0100
+++ speech-dispatcher/src/python/Makefile.in	2009-11-02 14:03:26.000000000 +0100
@@ -13,14 +13,14 @@
 
 install:
 	if test -x /usr/bin/python; then \
-		./setup.py install --prefix=${prefix}; \
+		./setup.py install --no-compile --prefix=${DESTDIR}${prefix}; \
 	else \
 		echo "Python not found, not installing speechd module nor spd-conf"; \
 	fi
-	cp speechd_config/test.wav @snddatadir@
+	cp speechd_config/test.wav ${DESTDIR}@snddatadir@
 
 uninstall:
-	rm -f @snddatadir@/test.wav
+	rm -f ${DESTDIR}@snddatadir@/test.wav
 
 clean:
 	rm -f *.pyc

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

root＠hilbert.suse.de

tags

participants (1)