[espeak] New version

[Jaroslav Škarvada]

commit 89afb02f47424c9985fcdc1c39716b05676c00b8
Author: Jaroslav Škarvada <jskarvad at redhat.com>
Date:   Fri Mar 22 14:49:41 2013 +0100

    New version
    
      Resolves: rhbz#924700
    - Workarounded RPM bug 924660 to allow clean update from 1.46 to 1.47
      Resolves: rhbz#924681
    - Fixed script for recompilation of voices

 espeak.spec |   24 ++++++++++++++++++++++--
 sources     |    2 +-
 2 files changed, 23 insertions(+), 3 deletions(-)
---
diff --git a/espeak.spec b/espeak.spec
index 7d92278..3ef8283 100644
--- a/espeak.spec
+++ b/espeak.spec
@@ -8,7 +8,7 @@
 %endif
 
 Name:           espeak
-Version:        1.47.01
+Version:        1.47.03
 Release:        1%{?dist}
 Summary:        Software speech synthesizer (text-to-speech)
 
@@ -75,7 +75,10 @@ make %{?_smp_mflags} CXXFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_LD_FLAGS" AUDIO=%{b
 # Compile the TTS voice dictionaries
 export ESPEAK_DATA_PATH=$RPM_BUILD_DIR/espeak-%{version}-source
 cd ../dictsource
-for voice in $(../src/speak --voices | awk '{print $2}{print $5}' | egrep -v Language\|File\|/ | uniq); do \
+# Strange sed regex to parse ambiguous output from 'speak --voices', filled upstream BZ 3608811
+for voice in $(../src/speak --voices | \
+LANG=C sed -n '/Age\/Gender/ ! s/ *[0-9]\+ *\([^ ]\+\) *M\? *[^ ]\+ *\(\((\|[A-Z]\)[^ ]\+\)\? *\([^ ]\+\).*/\1 \4/ p' | \
+sort | uniq); do \
     ../src/speak --compile=$voice; \
 done
 
@@ -92,6 +95,16 @@ cp -pf %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man1/
 rm -rf $RPM_BUILD_ROOT
 
 
+%pretrans
+# Hack to workaround RPM bug 924660 to allow clean update from 1.46 to 1.47
+if [ -d %{_datadir}/%{name}-data/voices/en ]
+then
+  rm -f %{_datadir}/%{name}-data/voices/en/*
+  rmdir %{_datadir}/%{name}-data/voices/en
+fi
+exit 0
+
+
 %post -p /sbin/ldconfig
 
 
@@ -114,6 +127,13 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Mar 22 2013 Jaroslav Škarvada <jskarvad at redhat.com> - 1.47.03-1
+- New version
+  Resolves: rhbz#924700
+- Workarounded RPM bug 924660 to allow clean update from 1.46 to 1.47
+  Resolves: rhbz#924681
+- Fixed script for recompilation of voices
+
 * Wed Mar 20 2013 Jaroslav Škarvada <jskarvad at redhat.com> - 1.47.01-1
 - New version
   Resolves: rhbz#923689
diff --git a/sources b/sources
index 261ad69..8813105 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4bf12664becd21bc3360c8a9e939933e  espeak-1.47.01-source.zip
+b9bb17842f79f08b390cfa31e52a7c68  espeak-1.47.03-source.zip