rpms/espeak/F-12 .cvsignore, 1.16, 1.17 espeak.spec, 1.23, 1.24 sources, 1.16, 1.17

[Francois Aucamp]

Author: faucamp

Update of /cvs/pkgs/rpms/espeak/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16228

Modified Files:
	.cvsignore espeak.spec sources 
Log Message:
* Thu Dec 17 2009 Francois Aucamp <faucamp at fedoraproject.org> - 1.42.04-1
- Update to version 1.42.04
- Revert: build against PortAudio instead of native PulseAudio (RHBZ #512190, #532674)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/espeak/F-12/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	22 Jun 2009 11:21:06 -0000	1.16
+++ .cvsignore	17 Dec 2009 10:00:29 -0000	1.17
@@ -1 +1 @@
-espeak-1.40.02-source.zip
+espeak-1.42.04-source.zip


Index: espeak.spec
===================================================================
RCS file: /cvs/pkgs/rpms/espeak/F-12/espeak.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- espeak.spec	24 Jul 2009 22:18:34 -0000	1.23
+++ espeak.spec	17 Dec 2009 10:00:30 -0000	1.24
@@ -1,6 +1,6 @@
 Name:           espeak
-Version:        1.40.02
-Release:        3%{?dist}
+Version:        1.42.04
+Release:        1%{?dist}
 Summary:        Software speech synthesizer (text-to-speech)
 
 Group:          Applications/Multimedia
@@ -10,10 +10,11 @@ Source0:        http://kent.dl.sourcefor
 Source1:        espeak.1
 Patch0:         espeak-1.23-makefile_nostaticlibs.patch
 Patch1:         espeak-1.40.02-gcc_no_libstdc++.patch
-Patch2:         espeak-1.40.02-pulseaudio.patch
+#Removed for now; see RHBZ#481651
+#Patch2:         espeak-1.40.02-pulseaudio.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  pulseaudio-libs-devel
+BuildRequires:  portaudio-devel gcc-c++
 
 
 %description
@@ -43,16 +44,21 @@ Development files for eSpeak, a software
 %setup -q -n espeak-%{version}-source
 %patch0 -p1 -b .nostaticlibs
 %patch1 -p1 -b .gcc_no_libstdc++
-%patch2 -p1 -b .pulseaudio
+
+#%patch2 -p1 -b .pulseaudio
 # Fix file permissions
 find . -type f -exec chmod 0644 {} ";"
 # Prepare documentation
+rm -rf docs/images/.svn
 mv docs html
 sed -i 's/\r//' License.txt
+# Compile against portaudio v19 (see ReadMe)
+cp -f src/portaudio19.h src/portaudio.h
 # Don't use the included binary voice dictionaries; we compile these from source
 rm -f espeak-data/*_dict
 
 
+
 %build
 # Compile espeak
 cd src
@@ -100,6 +106,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Dec 17 2009 Francois Aucamp <faucamp at fedoraproject.org> - 1.42.04-1
+- Update to version 1.42.04
+- Revert: build against PortAudio instead of native PulseAudio (RHBZ #512190, #532674)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.40.02-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/espeak/F-12/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	22 Jun 2009 11:21:07 -0000	1.16
+++ sources	17 Dec 2009 10:00:30 -0000	1.17
@@ -1 +1 @@
-708954b44c526e8174df8b88a6382738  espeak-1.40.02-source.zip
+a4cbbe5f2e2a37ccc0aa1a687a6e4c11  espeak-1.42.04-source.zip