rpms/speech-dispatcher
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- New upstream 0.7 stable release

Browse Source
This commit is contained in:
Peter Robinson 2010-08-03 16:19:04 +01:00
parent bb9f3bacda
commit 031f6bbf0b
6 changed files with 34 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1 +1,2 @@
speech-dispatcher-0.6.7.tar.gz
speech-dispatcher-0.7.tar.gz

2
sources
View File

@ -1 +1 @@
67432ad655b50fd7c1f1f79e012cfe3f speech-dispatcher-0.6.7.tar.gz
8e0d833c680c8217cc40d88c68c5265f speech-dispatcher-0.7.tar.gz

8
speech-dispatcher-fixdso.patch
View File

@ -1,9 +1,9 @@
--- speech-dispatcher-0.6.7/src/c/clients/say/Makefile.in.orig 2010-03-03 14:45:42.000000000 +0000
+++ speech-dispatcher-0.6.7/src/c/clients/say/Makefile.in 2010-03-03 14:46:04.000000000 +0000
@@ -99,7 +99,7 @@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
--- speech-dispatcher-0.7/src/c/clients/say/Makefile.in.orig 2010-06-16 15:43:06.000000000 +0100
+++ speech-dispatcher-0.7/src/c/clients/say/Makefile.in 2010-08-03 15:00:05.696051839 +0100
@@ -101,7 +101,7 @@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LD = @LD@
-LDFLAGS = @LDFLAGS@
+LDFLAGS = @LDFLAGS@ -lpthread
LIBOBJS = @LIBOBJS@

22
speech-dispatcher-gcc44-0.6.7.patch
View File

@ -1,22 +0,0 @@
--- speech-dispatcher-0.6.7/src/modules/module_main.c.orig 2009-05-20 11:40:37.000000000 +0100
+++ speech-dispatcher-0.6.7/src/modules/module_main.c 2009-05-20 11:40:46.000000000 +0100
@@ -22,7 +22,7 @@
*/
/* So that gcc doesn't comply */
-int getline(char**, size_t*, FILE*);
+/*int getline(char**, size_t*, FILE*);*/
#define PROCESS_CMD(command, function) \
if (!strcmp(cmd_buf, #command"\n")){ \
--- speech-dispatcher-0.6.7/src/modules/module_utils.h.orig 2009-05-20 11:48:06.000000000 +0100
+++ speech-dispatcher-0.6.7/src/modules/module_utils.h 2009-05-20 11:48:14.000000000 +0100
@@ -421,7 +421,7 @@
/* So that gcc doesn't complain */
-int getline(char**, size_t*, FILE*);
+/*int getline(char**, size_t*, FILE*);*/
pthread_mutex_t module_stdout_mutex;

103
speech-dispatcher.spec
View File

@ -1,47 +1,32 @@
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
%if 0%{?olpc}
%define with_nas 0
%define with_pulse 0
%define with_flite 0
%else
%define with_nas 1
%define with_pulse 1
%define with_flite 1
%endif
Name: speech-dispatcher
Version: 0.6.7
Release: 5%{?dist}.1
Summary: To provide a high-level device independent layer for speech synthesis
Group: System Environment/Libraries
Name: speech-dispatcher
Version: 0.7
Release: 1%{?dist}
Summary: To provide a high-level device independent layer for speech synthesis
Group: System Environment/Libraries
# Almost all files are under GPLv2+, however
# src/c/clients/spdsend/spdsend.h is licensed under GPLv2,
# which makes %%_bindir/spdsend GPLv2.
License: GPLv2+ and GPLv2
URL: http://www.freebsoft.org/pub/projects/speechd/
Source0: http://www.freebsoft.org/pub/projects/speechd/%{name}-%{version}.tar.gz
Source1: http://www.nsitonline.in/hemant/stuff/speechd-rpm/speech-dispatcherd
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Patch0: http://www.nsitonline.in/hemant/stuff/speechd-rpm/speechd.patch
Patch1: speech-dispatcher-gcc44-0.6.7.patch
Patch2: speech-dispatcher-fixdso.patch
License: GPLv2+ and GPLv2
URL: http://www.freebsoft.org/pub/projects/speechd/
Source0: http://www.freebsoft.org/pub/projects/speechd/%{name}-%{version}.tar.gz
Source1: speech-dispatcherd
Patch0: speech-dispatcher-fixdso.patch
BuildRequires: python-setuptools-devel
BuildRequires: espeak-devel
BuildRequires: alsa-lib-devel
BuildRequires: dotconf-devel
BuildRequires: texinfo
%ifnarch s390 s390x
BuildRequires: libraw1394
%endif
Buildrequires: pulseaudio-lib-devel
Buildrequires: glib2-devel
%if 0%{?fedora}
BuildRequires: flite-devel
Buildrequires: nas-devel
%ifnarch s390 s390x
BuildRequires: libraw1394
%endif
Requires(post): /sbin/chkconfig /sbin/install-info
@ -96,9 +81,7 @@ speechd python module
%prep
%setup -q
# patch needs further review as it has olpc specific changes in it.
#%patch0 -p1
%patch1 -p1 -b .gcc44
%patch2 -p1 -b .fixdso
%patch0 -p1 -b .fixdso
%build
iconv -f ISO-8859-2 -t UTF-8 doc/speech-dispatcher-cs.texi -o doc/speech-dispatcher-cs_c.texi
@ -133,11 +116,8 @@ for dir in \
popd
done
#Install the init shell script
%if 0%{?fedora}
mkdir -p $RPM_BUILD_ROOT%{_initrddir}
install -p -m 0755 %SOURCE1 $RPM_BUILD_ROOT%{_initrddir}/
%endif
mkdir -p $RPM_BUILD_ROOT%{_initrddir}
install -p -m 0755 %SOURCE1 $RPM_BUILD_ROOT%{_initrddir}/
#Rename certain generically named binaries
mv $RPM_BUILD_ROOT%{_bindir}/long_message $RPM_BUILD_ROOT%{_bindir}/spd_long_message
@ -156,15 +136,6 @@ mv $RPM_BUILD_ROOT%{_datadir}/speech-dispatcher/conf/speechd.conf $RPM_BUILD_ROO
mv $RPM_BUILD_ROOT%{_datadir}/speech-dispatcher/conf/clients/* $RPM_BUILD_ROOT%{_sysconfdir}/speech-dispatcher/clients
mv $RPM_BUILD_ROOT%{_datadir}/speech-dispatcher/conf/modules/* $RPM_BUILD_ROOT%{_sysconfdir}/speech-dispatcher/modules
# Now move the files, change ownerships, apply setuid settings incase build is for
# olpc.
%if 0%{?olpc}
#Move the speech-dispatcher configuration files to olpc writable location.
mkdir -p $RPM_BUILD_ROOT/home/olpc/.speechd
mv $RPM_BUILD_ROOT%{_sysconfdir}/speech-dispatcher/* $RPM_BUILD_ROOT/home/olpc/.speechd
%endif
# Remove dummy sound
%{__rm} -rf $RPM_BUILD_ROOT/%{_datadir}/sounds/
@ -176,43 +147,25 @@ rm -rf $RPM_BUILD_ROOT
%post
/sbin/ldconfig
%if 0%{?fedora}
/sbin/chkconfig --add speech-dispatcherd
%endif
/sbin/chkconfig --add speech-dispatcherd
%postun
/sbin/ldconfig
%if 0%{?fedora}
if [ "$1" -ge "1" ] ; then
/sbin/service speech-dispatcherd condrestart >/dev/null 2>&1 || :
fi
%endif
if [ "$1" -ge "1" ] ; then
/sbin/service speech-dispatcherd condrestart >/dev/null 2>&1 || :
fi
%preun
%if 0%{?fedora}
if [ $1 = 0 ] ; then
/sbin/service speech-dispatcherd stop >/dev/null 2>&1
/sbin/chkconfig --del speech-dispatcherd
fi
%endif
%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog NEWS README TODO COPYING
%doc AUTHORS ChangeLog NEWS README COPYING
%if 0%{?olpc}
%config(noreplace) %attr(0644,olpc,olpc) /home/olpc/.speechd/speechd.conf
%config(noreplace) %attr(0644,olpc,olpc) /home/olpc/.speechd/clients/*.conf
%config(noreplace) %attr(0644,olpc,olpc) /home/olpc/.speechd/modules/*.conf
%dir %attr(0755,olpc,olpc) /home/olpc/.speechd/
%dir %attr(0755,olpc,olpc) /home/olpc/.speechd/clients
%dir %attr(0755,olpc,olpc) /home/olpc/.speechd/modules
%else
%config(noreplace) %{_sysconfdir}/speech-dispatcher/speechd.conf
%config(noreplace) %{_sysconfdir}/speech-dispatcher/clients/*.conf
%config(noreplace) %{_sysconfdir}/speech-dispatcher/modules/*.conf
@ -220,7 +173,6 @@ fi
%dir %{_sysconfdir}/speech-dispatcher/
%dir %{_sysconfdir}/speech-dispatcher/clients
%dir %{_sysconfdir}/speech-dispatcher/modules
%endif
%{_bindir}/*
@ -228,17 +180,15 @@ fi
%dir %{_libdir}/speech-dispatcher-modules
%{_libdir}/libspeechd.so.2
%{_libdir}/libspeechd.so.2.1.1
%{_libdir}/libspeechd.so.2.2.1
%dir %{_libdir}/speech-dispatcher
%{_libdir}/speech-dispatcher/lib*.so
%{_libdir}/speech-dispatcher/libsdaudio.so.2
%{_libdir}/speech-dispatcher/libsdaudio.so.2.0.2
%{_libdir}/speech-dispatcher/libsdaudio.so.2.0.3
%dir %attr(0700, root, root) %{_localstatedir}/log/speech-dispatcher/
%if 0%{?fedora}
%attr(0755,root,root)%{_initrddir}/speech-dispatcherd
%endif
%attr(0755,root,root)%{_initrddir}/speech-dispatcherd
%files devel
%defattr(-,root,root,-)
@ -268,10 +218,13 @@ fi
%{python_sitelib}/speechd*
%changelog
* Tue Aug 3 2010 Peter Robinson <pbrobinson@gmail.com> - 0.7-1
- New upstream 0.7 stable release
* Thu Jul 22 2010 David Malcolm <dmalcolm@redhat.com> - 0.6.7-5.1
- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
* Mon Mar 08 2010 Karsten Hopp <karsten@redhat.com> 0.6.7-4.1
* Mon Mar 08 2010 Karsten Hopp <karsten@redhat.com> - 0.6.7-4.1
- disable libraw1394 build requirement on s390(x)
* Wed Mar 3 2010 Peter Robinson <pbrobinson@gmail.com> - 0.6.7-4

24
speechd.patch
View File

@ -1,24 +0,0 @@
--- speech-dispatcher-0.6.6/config/speechd.conf.in 2008-01-28 18:49:14.000000000 +0530
+++ speech-dispatcher-patched-0.6.6/config/speechd.conf.in 2008-07-18 15:54:41.000000000 +0530
@@ -36,8 +36,8 @@
# DO NOT COMMENT OUT THIS OPTION, SET IT TO "default" if you do not
# want to influence it.
-LogDir "default"
-#LogDir "/var/log/speech-dispatcher/"
+#LogDir "default"
+LogDir "/home/olpc/.speechd/"
#LogDir "stdout"
# CustomLogFile allows logging all messages of the given kind,
@@ -130,8 +130,8 @@
# either relative (to etc/speechd/modules/) or absolute
AddModule "espeak" "sd_espeak" "espeak.conf"
-AddModule "festival" "sd_festival" "festival.conf"
-AddModule "flite" "sd_flite" "flite.conf"
+#AddModule "festival" "sd_festival" "festival.conf"
+#AddModule "flite" "sd_flite" "flite.conf"
#AddModule "espeak-generic" "sd_generic" "espeak-generic.conf"
#AddModule "epos-generic" "sd_generic" "epos-generic.conf"
#AddModule "dtk-generic" "sd_generic" "dtk-generic.conf"