rpms/espeak/F-7 espeak.spec,1.11,1.12 sources,1.11,1.12

[Francois Aucamp (faucamp)]

Author: faucamp

Update of /cvs/pkgs/rpms/espeak/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16531

Modified Files:
	espeak.spec sources 
Log Message:
Update to version 1.31
Compile the voice dictionaries from source



Index: espeak.spec
===================================================================
RCS file: /cvs/pkgs/rpms/espeak/F-7/espeak.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- espeak.spec	15 Jan 2008 13:04:03 -0000	1.11
+++ espeak.spec	13 Feb 2008 14:15:37 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           espeak
-Version:        1.30
-Release:        1%{?dist}
+Version:        1.31
+Release:        4%{?dist}
 Summary:        Software speech synthesizer (text-to-speech)
 
 Group:          Applications/Multimedia
@@ -48,22 +48,30 @@
     # F8 uses portaudio v19 - compile against that (see ReadMe)
     cp -f src/portaudio19.h src/portaudio.h
 %endif
+# Don't use the included binary voice dictionaries; we compile these from source
+rm -f espeak-data/*_dict
 
 
 %build
+# Compile espeak
 cd src
-make %{?_smp_mflags} CXXFLAGS="${RPM_OPT_FLAGS}"
+make %{?_smp_mflags} CXXFLAGS="$RPM_OPT_FLAGS"
+
+# Compile the TTS voice dictionaries
+cd ../dictsource
+for voice in $(../src/speak --voices | awk '{print $2}{print $5}' | egrep -v Language\|File\|/ | uniq); do \
+    ../src/speak --compile=$voice; \
+done
 
 
 %install
-rm -rf %{buildroot}
-rmdir --ignore-fail-on-non-empty espeak-data/soundicons
-cd src
-make install DESTDIR=%{buildroot} BINDIR=%{_bindir} INCDIR=%{_includedir}/espeak LIBDIR=%{_libdir}
+rm -rf $RPM_BUILD_ROOT
+cd $RPM_BUILD_DIR/espeak-%{version}-source/src
+make install DESTDIR=$RPM_BUILD_ROOT BINDIR=%{_bindir} INCDIR=%{_includedir}/espeak LIBDIR=%{_libdir}
 
 
 %clean
-rm -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
 
 
 %post -p /sbin/ldconfig
@@ -74,7 +82,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc ReadMe ChangeLog License.txt html/
+%doc $RPM_BUILD_DIR/espeak-%{version}-source/ReadMe $RPM_BUILD_DIR/espeak-%{version}-source/ChangeLog $RPM_BUILD_DIR/espeak-%{version}-source/License.txt $RPM_BUILD_DIR/espeak-%{version}-source/html/
 %{_bindir}/espeak
 %{_datadir}/espeak-data
 %{_libdir}/libespeak.so.*
@@ -87,6 +95,31 @@
 
 
 %changelog
+* Tue Jan 29 2008 Francois Aucamp <faucamp at fedoraproject.org> - 1.31-4
+- Removed libjack patches as they are unnecessary
+
+* Tue Jan 29 2008 Francois Aucamp <faucamp at fedoraproject.org> - 1.31-3
+- Added "makefile_libjack" patch to link to libjack
+- Added BuildRequires: jack-audio-connection-kit-devel
+
+* Fri Jan 25 2008 Francois Aucamp <faucamp at fedoraproject.org> - 1.31-2
+- Removed espeakedit (and associated patches and BuildRequires) from package
+  until all phoneme table compilation functions can be moved into espeak (or a
+  separate commandline app without wxGTK dependencies)
+- Voices are still compiled from source, but using pre-compiled phoneme table
+  from upstream until the above issue is resolved
+
+* Thu Jan 24 2008 Francois Aucamp <faucamp at fedoraproject.org> - 1.31-1
+- Update to version 1.31
+- Compile phoneme tables and voice dictionaries from source instead of
+  packaging pre-compiled binary data
+- Added espeakedit as Source1
+- Added BuildRequires: wxGTK-devel for espeakedit
+- Added "makefile_rpmoptflags_wxversion" espeakedit patch to enable
+  RPM_OPT_FLAGS and set the correct wxWidgets version
+- Added "espeak_data_path" espeakedit patch to be able to set control the
+  source directory that espeakedit's compiler uses
+
 * Tue Jan 15 2008 Francois Aucamp <faucamp at fedoraproject.org> - 1.30-1
 - Update to version 1.30
 - Removed local "synthdata_strlen" patch (included upstream)
@@ -164,4 +197,3 @@
 
 * Wed Oct 04 2006 Francois Aucamp <faucamp at csir.co.za> - 1.16-1
 - Initial RPM build
-


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/espeak/F-7/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	15 Jan 2008 13:04:03 -0000	1.11
+++ sources	13 Feb 2008 14:15:37 -0000	1.12
@@ -1 +1 @@
-ac0869d3bb9a6254b40ecde9a77d88df  espeak-1.30-source.zip
+e11f04354af42677729b0f22ce891d71  espeak-1.31-source.zip