[espeak] Workaround for RPM bug 924660 rewrote for post

Jaroslav Škarvada jskarvad at fedoraproject.org
Tue Mar 26 08:56:34 UTC 2013


commit 86776e9f3075170d0ba9203bc63a2b95df8d13ad
Author: Jaroslav Škarvada <jskarvad at redhat.com>
Date:   Tue Mar 26 09:56:27 2013 +0100

    Workaround for RPM bug 924660 rewrote for post

 espeak.spec |   23 +++++++++++++++--------
 1 files changed, 15 insertions(+), 8 deletions(-)
---
diff --git a/espeak.spec b/espeak.spec
index 1ddfd26..1f8a030 100644
--- a/espeak.spec
+++ b/espeak.spec
@@ -9,7 +9,7 @@
 
 Name:           espeak
 Version:        1.47.03
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Software speech synthesizer (text-to-speech)
 
 Group:          Applications/Multimedia
@@ -91,23 +91,26 @@ make install DESTDIR=$RPM_BUILD_ROOT BINDIR=%{_bindir} INCDIR=%{_includedir}/esp
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
 cp -pf %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man1/
 
+# Hack to workaround RPM bug 924660 to allow clean update from espeak-1.46 to espeak-1.47, could be probably dropped in f21+
+mv %{buildroot}%{_datadir}/%{name}-data/voices/en %{buildroot}%{_datadir}/%{name}-data/voices/_en
+touch %{buildroot}%{_datadir}/%{name}-data/voices/en
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
-%pre
-# Hack to workaround RPM bug 924660 to allow clean update from 1.46 to 1.47
+%post
+/sbin/ldconfig
+# Hack to workaround RPM bug 924660 to allow clean update from espeak-1.46 to espeak-1.47, could be probably dropped in f21+
 if [ -d %{_datadir}/%{name}-data/voices/en ]
 then
   rm -f %{_datadir}/%{name}-data/voices/en/*
   rmdir %{_datadir}/%{name}-data/voices/en
 fi
+[ -f %{_datadir}/%{name}-data/voices/_en ] && \
+  cp -f %{_datadir}/%{name}-data/voices/_en %{_datadir}/%{name}-data/voices/en &> /dev/null || :
 exit 0
 
-
-%post -p /sbin/ldconfig
-
-
 %postun -p /sbin/ldconfig
 
 
@@ -118,7 +121,8 @@ exit 0
 %{_bindir}/espeak
 %{_datadir}/espeak-data
 %{_libdir}/libespeak.so.*
-
+# Hack to workaround RPM bug 924660 to allow clean update from espeak-1.46 to espeak-1.47, could be probably dropped in f21+
+%ghost %{_datadir}/espeak-data/voices/en
 
 %files devel
 %defattr(-,root,root)
@@ -127,6 +131,9 @@ exit 0
 
 
 %changelog
+* Tue Mar 26 2013 Jaroslav Škarvada <jskarvad at redhat.com> - 1.47.03-3
+- Workaround for RPM bug 924660 rewrote for post
+
 * Sun Mar 24 2013 Jaroslav Škarvada <jskarvad at redhat.com> - 1.47.03-2
 - Workaround for RPM bug 924660 moved from pretrans to pre
   Resolves: rhbz#926004


More information about the scm-commits mailing list