OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 20-Mar-2008 23:53:26
Branch: HEAD Handle: 2008032022532401
Modified files:
openpkg-src/festival festival.patch festival.spec
Log:
simplify packaging and as a intended side-effect fix the text2wav(1)
tool
Summary:
Revision Changes Path
1.4 +12 -0 openpkg-src/festival/festival.patch
1.4 +4 -18 openpkg-src/festival/festival.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/festival/festival.patch
============================================================================
$ cvs diff -u -r1.3 -r1.4 festival.patch
--- openpkg-src/festival/festival.patch 20 Mar 2008 16:47:32 -0000
1.3
+++ openpkg-src/festival/festival.patch 20 Mar 2008 22:53:24 -0000
1.4
@@ -73,3 +73,15 @@
; if next seg is not silence insert one.
(if (or (not (item.next seg))
(not (string-equal (item.name (item.next seg)) silence)))
+Index: festival/src/arch/festival/audspio.cc
+--- festival/src/arch/festival/audspio.cc.orig 2004-09-30 15:04:17
+0200
++++ festival/src/arch/festival/audspio.cc 2008-03-20 23:41:13 +0100
+@@ -108,7 +108,7 @@
+ {
+ audio = ft_get_param("Audio_Method");
+ command = ft_get_param("Audio_Command");
+- audfds = pipe_open("audsp");
++ audfds = pipe_open("festival_audsp");
+ if (audio != NIL)
+ audsp_send(EST_String("method ")+get_c_string(audio));
+ if (command != NIL)
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/festival/festival.spec
============================================================================
$ cvs diff -u -r1.3 -r1.4 festival.spec
--- openpkg-src/festival/festival.spec 20 Mar 2008 16:41:33 -0000
1.3
+++ openpkg-src/festival/festival.spec 20 Mar 2008 22:53:25 -0000
1.4
@@ -121,6 +121,8 @@
# build festival toolkit
( cd festival
+ ( echo "FTLIBDIR=%{l_prefix}/lib/festival"
+ ) >>config/config.in
CC="%{l_cc}" \
CXX="%{l_cxx}" \
CFLAGS="%{l_cflags -O}" \
@@ -140,33 +142,17 @@
$RPM_BUILD_ROOT%{l_prefix}/man/man1 \
$RPM_BUILD_ROOT%{l_prefix}/etc/rc.d \
$RPM_BUILD_ROOT%{l_prefix}/etc/festival \
- $RPM_BUILD_ROOT%{l_prefix}/libexec/festival \
$RPM_BUILD_ROOT%{l_prefix}/lib/festival \
$RPM_BUILD_ROOT%{l_prefix}/var/festival
# install program files
%{l_shtool} install -c -m 755 \
festival/lib/etc/*/audsp \
- $RPM_BUILD_ROOT%{l_prefix}/libexec/festival/
+ $RPM_BUILD_ROOT%{l_prefix}/bin/festival_audsp
%{l_shtool} install -c -m 755 \
festival/src/main/festival \
festival/src/main/festival_client \
- $RPM_BUILD_ROOT%{l_prefix}/libexec/festival/
- ( echo "#!/bin/sh"
- echo "PATH=%{l_prefix}/libexec/festival:\$PATH"
- echo "export PATH"
- echo "exec %{l_prefix}/libexec/festival/festival \\"
- echo " --libdir %{l_prefix}/lib/festival \$*"
- ) >festival.sh
- ( echo "#!/bin/sh"
- echo "PATH=%{l_prefix}/libexec/festival:\$PATH"
- echo "export PATH"
- echo "exec %{l_prefix}/libexec/festival/festival_client \$*"
- ) >festival_client.sh
- %{l_shtool} install -c -m 755 \
- festival.sh $RPM_BUILD_ROOT%{l_prefix}/bin/festival
- %{l_shtool} install -c -m 755 \
- festival_client.sh $RPM_BUILD_ROOT%{l_prefix}/bin/festival_client
+ $RPM_BUILD_ROOT%{l_prefix}/bin/
%{l_shtool} install -c -m 644 \
festival/doc/festival.1 \
festival/doc/festival_client.1 \
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
