rpms/espeak/devel .cvsignore, 1.3, 1.4 espeak.spec, 1.2, 1.3 makefile_lpthread.patch, 1.1, 1.2 sources, 1.3, 1.4 espeak_program_name.patch, 1.2, NONE

Mon Jan 15 14:07:58 UTC 2007

Author: faucamp

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

Modified Files:
	.cvsignore espeak.spec makefile_lpthread.patch sources 
Removed Files:
	espeak_program_name.patch 
Log Message:
- Update to version 1.18
- Dropped statically-linked "speak" executable (replaced by dynamically-linked "espeak" executable)
- Removed the "espeak program name" patch as it has been included upstream
- Removed "espeak program name" patch backup file cleanup from %%install
- Minor modification to "makefile lpthread" patch to account for new lib/executable
- Removed "BIN_NAME" variable from make in %%build (implemented upstream)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/espeak/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4

--- .cvsignore	21 Nov 2006 16:38:26 -0000	1.3
+++ .cvsignore	15 Jan 2007 14:07:28 -0000	1.4
@@ -1 +1 @@
-espeak-1.17-source.zip
+espeak-1.18-source.zip


Index: espeak.spec
===================================================================
RCS file: /cvs/extras/rpms/espeak/devel/espeak.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- espeak.spec	21 Nov 2006 16:38:26 -0000	1.2
+++ espeak.spec	15 Jan 2007 14:07:28 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           espeak
-Version:        1.17
+Version:        1.18
 Release:        1%{?dist}
 Summary:        Software speech synthesizer (text-to-speech)
 
@@ -8,7 +8,6 @@
 URL:            http://espeak.sourceforge.net
 Source0:        http://kent.dl.sourceforge.net/sourceforge/espeak/espeak-%{version}-source.zip
 Patch0:         makefile_lpthread.patch
-Patch1:         espeak_program_name.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  portaudio-devel
@@ -41,23 +40,19 @@
 %setup -q -n espeak-%{version}-source
 chmod 0644 src/* 
 %patch0 -p1 -b .pthread
-%patch1 -p1 -b .espeak_name
 # Prepare documentation
 mv docs html
 sed -i 's/\r//' License.txt
 
 
-
 %build
 cd src
-make %{?_smp_mflags} BIN_NAME=espeak CXXFLAGS="${RPM_OPT_FLAGS}"
+make %{?_smp_mflags} CXXFLAGS="${RPM_OPT_FLAGS}"
 
 
 %install
 rm -rf %{buildroot}
 rmdir --ignore-fail-on-non-empty espeak-data/soundicons
-# Remove backup files in documentation created by espeak_program_name patch
-rm -f html/*.espeak_name
 cd src
 make install DESTDIR=%{buildroot} BINDIR=%{_bindir} INCDIR=%{_includedir}/espeak LIBDIR=%{_libdir}
 
@@ -87,6 +82,14 @@
 
 
 %changelog
+* Mon Jan 15 2007 Francois Aucamp <faucamp at csir.co.za> - 1.18-1
+- Update to version 1.18
+- Dropped statically-linked "speak" executable (replaced by dynamically-linked "espeak" executable)
+- Removed the "espeak program name" patch as it has been included upstream
+- Removed "espeak program name" patch backup file cleanup from %%install
+- Minor modification to "makefile lpthread" patch to account for new lib/executable
+- Removed "BIN_NAME" variable from make in %%build (implemented upstream)
+
 * Mon Nov 20 2006 Francois Aucamp <faucamp at csir.co.za> - 1.17-1
 - Update to version 1.17
 - Removed "makefile install target" patch as it has been included upstream

makefile_lpthread.patch:

Index: makefile_lpthread.patch
===================================================================
RCS file: /cvs/extras/rpms/espeak/devel/makefile_lpthread.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- makefile_lpthread.patch	9 Nov 2006 17:28:19 -0000	1.1
+++ makefile_lpthread.patch	15 Jan 2007 14:07:28 -0000	1.2
@@ -1,7 +1,7 @@
-diff -uNr espeak-1.16-source/src/Makefile espeak-1.16-source-mod/src/Makefile
---- espeak-1.16-source/src/Makefile	2006-10-03 00:59:36.000000000 +0200
-+++ espeak-1.16-source-mod/src/Makefile	2006-10-04 15:35:34.000000000 +0200
-@@ -11,7 +11,7 @@
+diff -uNr espeak-1.18-source/src/Makefile espeak-1.18-source-mod/src/Makefile
+--- espeak-1.18-source/src/Makefile	2007-01-15 03:08:03.000000000 +0200
++++ espeak-1.18-source-mod/src/Makefile	2007-01-15 15:53:40.000000000 +0200
+@@ -28,11 +28,11 @@
  
  SRCS1=$(speak_SOURCES)
  OBJS1=$(patsubst %.cpp,%.o,$(SRCS1))
@@ -10,3 +10,100 @@
  
  SRCS2=$(libespeak_SOURCES)
  OBJS2=$(patsubst %.cpp,x_%.o,$(SRCS2))
+-LIBS2=-lstdc++ -lportaudio
++LIBS2=-lstdc++ -lportaudio -lpthread
+ 
+ SRCS3 = espeak.cpp
+ OBJS3=$(patsubst %.cpp,%.o,$(SRCS3))
+diff -uNr espeak-1.18-source/src/Makefile.orig espeak-1.18-source-mod/src/Makefile.orig
+--- espeak-1.18-source/src/Makefile.orig	1970-01-01 02:00:00.000000000 +0200
++++ espeak-1.18-source-mod/src/Makefile.orig	2007-01-15 03:08:03.000000000 +0200
+@@ -0,0 +1,88 @@
++BINDIR=/usr/bin
++INCDIR=/usr/include/espeak
++LIBDIR=/usr/lib
++DATADIR=/usr/share/espeak-data
++
++RELEASE = 1.18
++BIN_NAME = speak
++BIN2_NAME = espeak
++LIB_NAME = libespeak.so
++LIB_VERSION = 1
++LIBTAG = $(LIB_VERSION).$(RELEASE)
++
++INSTALL = /usr/bin/install
++LN_SF = /bin/ln -sf
++MKDIR = mkdir -p
++
++speak_SOURCES = speak.cpp compiledict.cpp dictionary.cpp intonation.cpp \
++	readclause.cpp setlengths.cpp numbers.cpp \
++	synthdata.cpp synthesize.cpp translate.cpp tr_english.cpp \
++	tr_languages.cpp voices.cpp wavegen.cpp
++
++libespeak_SOURCES = speak_lib.cpp compiledict.cpp dictionary.cpp intonation.cpp \
++	readclause.cpp setlengths.cpp numbers.cpp \
++	synthdata.cpp synthesize.cpp translate.cpp tr_english.cpp \
++	tr_languages.cpp voices.cpp wavegen.cpp \
++	espeak_command.cpp event.cpp fifo.cpp wave.cpp debug.cpp
++
++
++SRCS1=$(speak_SOURCES)
++OBJS1=$(patsubst %.cpp,%.o,$(SRCS1))
++LIBS1=-lstdc++ -lportaudio
++
++SRCS2=$(libespeak_SOURCES)
++OBJS2=$(patsubst %.cpp,x_%.o,$(SRCS2))
++LIBS2=-lstdc++ -lportaudio
++
++SRCS3 = espeak.cpp
++OBJS3=$(patsubst %.cpp,%.o,$(SRCS3))
++LIBS3=-lstdc++ ./libespeak.so
++
++CXXFLAGS=-O2
++
++
++all: $(BIN_NAME) $(LIB_NAME) $(BIN2_NAME)
++	mv $(LIB_NAME) $(LIB_NAME).$(LIBTAG)
++
++.cpp.o:
++	$(CXX) $(CXXFLAGS) -D PATH_ESPEAK_DATA=\"$(DATADIR)\" -Wall -pedantic -I. -c -fno-exceptions $<
++
++$(BIN_NAME): $(OBJS1)
++	$(CXX) -o $@ $(OBJS1) $(LIBS1)
++
++$(BIN2_NAME): $(OBJS3)
++	$(CXX) -o $@ $(OBJS3) $(LIBS3)
++
++
++
++x_%.o: %.cpp
++	$(CXX) $(CXXFLAGS) -Wall -fpic -fvisibility=hidden -pedantic \
++	-I. -D LIBRARY -c -fno-exceptions $<  -o x_$*.o
++
++$(LIB_NAME): $(OBJS2)
++	$(CXX) -shared -Wl,-soname,$(LIB_NAME).$(LIB_VERSION) -o $@ $(OBJS2) $(LIBS2)
++
++clean:
++	rm -f *.o *~
++
++distclean: clean
++	rm -f $(BIN_NAME)
++	rm -f $(LIB_NAME)*
++
++install: all
++	# Create directories
++	$(MKDIR) $(DESTDIR)$(BINDIR)
++	$(MKDIR) $(DESTDIR)$(LIBDIR)
++	$(MKDIR) $(DESTDIR)$(INCDIR)
++	$(MKDIR) $(DESTDIR)$(DATADIR)
++	# Install espeak executable
++	$(INSTALL) -m 755 $(BIN2_NAME) $(DESTDIR)$(BINDIR)
++	# Install shared library
++	$(INSTALL) -m 755 $(LIB_NAME).$(LIBTAG) $(DESTDIR)$(LIBDIR)
++	$(LN_SF) $(LIB_NAME).$(LIBTAG) $(DESTDIR)$(LIBDIR)/$(LIB_NAME).$(LIB_VERSION)
++	$(LN_SF) $(LIB_NAME).$(LIB_VERSION) $(DESTDIR)$(LIBDIR)/$(LIB_NAME)
++	# Install development headers
++	$(INSTALL) -pm 644 speak_lib.h $(DESTDIR)$(INCDIR)
++	# Install data files
++	cp -prf ../espeak-data/* $(DESTDIR)$(DATADIR)
++


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/espeak/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	21 Nov 2006 16:38:26 -0000	1.3
+++ sources	15 Jan 2007 14:07:28 -0000	1.4
@@ -1 +1 @@
-6deb00b3fc73b0ef0cc6687b4cfc7ae2  espeak-1.17-source.zip
+8e5ed7ff85c56ca2c5f2fcaba36df110  espeak-1.18-source.zip


--- espeak_program_name.patch DELETED ---


