rpms/espeak/devel espeak-1.28-synthdata_strlen.patch, NONE, 1.1 .cvsignore, 1.10, 1.11 espeak.spec, 1.10, 1.11 sources, 1.10, 1.11

[Francois Aucamp (faucamp)]

Author: faucamp

Update of /cvs/pkgs/rpms/espeak/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28111

Modified Files:
	.cvsignore espeak.spec sources 
Added Files:
	espeak-1.28-synthdata_strlen.patch 
Log Message:
- Update to version 1.28
- Added "synthdata_strlen" patch to fix memory allocation issue on x86_64 (RHBZ #252712)
- Modified %%prep to build against portaudio v19 for F8 and later
- Upstream license changed from GPLv2+ to GPLv3+


espeak-1.28-synthdata_strlen.patch:

--- NEW FILE espeak-1.28-synthdata_strlen.patch ---
diff -uNr espeak-1.28-source/src/synthdata.cpp espeak-1.28-source-mod/src/synthdata.cpp
--- espeak-1.28-source/src/synthdata.cpp	2007-07-16 19:54:22.000000000 +0200
+++ espeak-1.28-source-mod/src/synthdata.cpp	2007-08-20 10:13:37.000000000 +0200
@@ -635,7 +635,7 @@
 			if(ix==2)
 			{
 				soundicon_tab[n_soundicon_tab].name = c1;
-				p = Alloc(strlen(string+1));
+				p = Alloc(strlen(string)+1);
 				strcpy(p,string);
 				soundicon_tab[n_soundicon_tab].filename = p;
 				soundicon_tab[n_soundicon_tab++].length = 0;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/espeak/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	19 Jun 2007 18:40:27 -0000	1.10
+++ .cvsignore	20 Aug 2007 08:34:58 -0000	1.11
@@ -1 +1 @@
-espeak-1.26-source.zip
+espeak-1.28-source.zip


Index: espeak.spec
===================================================================
RCS file: /cvs/pkgs/rpms/espeak/devel/espeak.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- espeak.spec	19 Jun 2007 18:40:27 -0000	1.10
+++ espeak.spec	20 Aug 2007 08:34:58 -0000	1.11
@@ -1,13 +1,14 @@
 Name:           espeak
-Version:        1.26
+Version:        1.28
 Release:        1%{?dist}
 Summary:        Software speech synthesizer (text-to-speech)
 
 Group:          Applications/Multimedia
-License:        GPL
+License:        GPLv3+
 URL:            http://espeak.sourceforge.net
 Source0:        http://kent.dl.sourceforge.net/sourceforge/espeak/espeak-%{version}-source.zip
 Patch0:         espeak-1.23-makefile_nostaticlibs.patch
+Patch1:         espeak-1.28-synthdata_strlen.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  portaudio-devel
@@ -39,13 +40,16 @@
 %prep
 %setup -q -n espeak-%{version}-source
 %patch0 -p1 -b .nostaticlibs
+%patch1 -p1 -b .synthdata_strlen
 # Fix file permissions
 find . -type f -exec chmod 0644 {} ";"
 # Prepare documentation
 mv docs html
 sed -i 's/\r//' License.txt
-# Compile against portaudio v19 (see ReadMe)
-cp -f src/portaudio19.h src/portaudio.h
+%if 0%{?fedora} >= 8
+    # F8 uses portaudio v19 - compile against that (see ReadMe)
+    cp -f src/portaudio19.h src/portaudio.h
+%endif
 
 
 %build
@@ -85,6 +89,12 @@
 
 
 %changelog
+* Mon Aug 20 2007 Francois Aucamp <faucamp at csir.co.za> - 1.28-1
+- Update to version 1.28
+- Added "synthdata_strlen" patch to fix memory allocation issue on x86_64 (RHBZ #252712)
+- Modified %%prep to build against portaudio v19 for F8 and later
+- Upstream license changed from GPLv2+ to GPLv3+
+
 * Tue Jun 19 2007 Francois Aucamp <faucamp at csir.co.za> - 1.26-1
 - Update to version 1.26
 - Modified %%prep to build against portaudio v19


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/espeak/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	19 Jun 2007 18:40:27 -0000	1.10
+++ sources	20 Aug 2007 08:34:58 -0000	1.11
@@ -1 +1 @@
-fa29ac3c24df96925b4df98f3f19e2be  espeak-1.26-source.zip
+6eb2ee58909d2819550b1d016f30da74  espeak-1.28-source.zip