simplify packaging and as a intended side-effect fix the text2wav(1) tool

festival/festival.patch

@@ -73,3 +73,15 @@ Index: festival/lib/init.scm
  ; 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)

festival/festival.spec

@@ -121,6 +121,8 @@ AutoReqProv:  no
 
     #   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 @@ AutoReqProv:  no
         $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 \