[espeak] New version

[Jaroslav Škarvada]

commit 43cf1cf260698c9304c883dca54e29a5d605fbd8
Author: Jaroslav Škarvada <jskarvad at redhat.com>
Date:   Tue Feb 11 09:51:55 2014 +0100

    New version
    
      Resolves: rhbz#1060538

 espeak-1.47-help-fix.patch |   14 --------------
 espeak-1.48-help-fix.patch |   14 ++++++++++++++
 espeak.spec                |   20 +++++++++++++-------
 sources                    |    2 +-
 4 files changed, 28 insertions(+), 22 deletions(-)
---
diff --git a/espeak-1.48-help-fix.patch b/espeak-1.48-help-fix.patch
new file mode 100644
index 0000000..bcf76a1
--- /dev/null
+++ b/espeak-1.48-help-fix.patch
@@ -0,0 +1,14 @@
+diff --git a/src/espeak.cpp b/src/espeak.cpp
+index dbd83f2..bf9c6c3 100644
+--- a/src/espeak.cpp
++++ b/src/espeak.cpp
+@@ -83,7 +83,8 @@ static const char *help_text =
+ "--version  Shows version number and date, and location of espeak-data\n"
+ "--voices=<language>\n"
+ "\t   List the available voices for the specified language.\n"
+-"\t   If <language> is omitted, then list all voices.\n";
++"\t   If <language> is omitted, then list all voices.\n"
++"-h, --help Show this help.\n";
+ 
+ 
+ 
diff --git a/espeak.spec b/espeak.spec
index de174df..157f410 100644
--- a/espeak.spec
+++ b/espeak.spec
@@ -7,9 +7,11 @@
 %global backend pulseaudio
 %endif
 
+%global version_workaround 1.48.01
+
 Name:           espeak
-Version:        1.47.11
-Release:        4%{?dist}
+Version:        1.48.02
+Release:        1%{?dist}
 Summary:        Software speech synthesizer (text-to-speech)
 
 Group:          Applications/Multimedia
@@ -21,7 +23,7 @@ Source1:        espeak.1
 Patch0:         espeak-1.47-makefile-nostaticlibs.patch
 Patch1:         espeak-1.47-ftbs-ld-libm.patch
 # Upstream ticket: https://sourceforge.net/p/espeak/patches/10/
-Patch2:         espeak-1.47-help-fix.patch
+Patch2:         espeak-1.48-help-fix.patch
 # Upstream ticket: https://sourceforge.net/p/espeak/bugs/105/
 Patch3:         espeak-1.47-wav-close.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -56,7 +58,7 @@ Development files for eSpeak, a software speech synthesizer.
 
 
 %prep
-%setup -q -n espeak-%{version}-source
+%setup -q -n espeak-%{version_workaround}-source
 %patch0 -p1 -b .nostaticlibs
 %patch1 -p1 -b .ftbs-ld-libm
 %patch2 -p1 -b .help-fix
@@ -80,7 +82,7 @@ cd src
 make %{?_smp_mflags} CXXFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_LD_FLAGS" AUDIO=%{backend}
 
 # Compile the TTS voice dictionaries
-export ESPEAK_DATA_PATH=$RPM_BUILD_DIR/espeak-%{version}-source
+export ESPEAK_DATA_PATH=$RPM_BUILD_DIR/espeak-%{version_workaround}-source
 cd ../dictsource
 # Strange sed regex to parse ambiguous output from 'speak --voices', filled upstream BZ 3608811
 for voice in $(../src/speak --voices | \
@@ -92,7 +94,7 @@ done
 
 %install
 rm -rf $RPM_BUILD_ROOT
-cd $RPM_BUILD_DIR/espeak-%{version}-source/src
+cd $RPM_BUILD_DIR/espeak-%{version_workaround}-source/src
 make install DESTDIR=$RPM_BUILD_ROOT BINDIR=%{_bindir} INCDIR=%{_includedir}/espeak LIBDIR=%{_libdir} AUDIO=%{backend}
 # Install manpage
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
@@ -123,7 +125,7 @@ exit 0
 
 %files
 %defattr(-,root,root,-)
-%doc $RPM_BUILD_DIR/espeak-%{version}-source/ReadMe $RPM_BUILD_DIR/espeak-%{version}-source/ChangeLog.txt $RPM_BUILD_DIR/espeak-%{version}-source/License.txt $RPM_BUILD_DIR/espeak-%{version}-source/html/
+%doc $RPM_BUILD_DIR/espeak-%{version_workaround}-source/ReadMe $RPM_BUILD_DIR/espeak-%{version_workaround}-source/ChangeLog.txt $RPM_BUILD_DIR/espeak-%{version_workaround}-source/License.txt $RPM_BUILD_DIR/espeak-%{version_workaround}-source/html/
 %{_mandir}/man1/espeak.1.gz
 %{_bindir}/espeak
 %{_datadir}/espeak-data
@@ -138,6 +140,10 @@ exit 0
 
 
 %changelog
+* Mon Feb 10 2014 Jaroslav Škarvada <jskarvad at redhat.com> - 1.48.02-1
+- New version
+  Resolves: rhbz#1060538
+
 * Mon Aug 12 2013 Jaroslav Škarvada <jskarvad at redhat.com> - 1.47.11-4
 - Fixed truncation of wave file on multi line input
   Resolves: rhbz#967229
diff --git a/sources b/sources
index 950e4f3..f5463be 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2e1c733f9b6cbf48138a4fbc5b2f7ecb  espeak-1.47.11-source.zip
+281f96c90d1c973134ca1807373d9e67  espeak-1.48.02-source.zip