From 99bb79d79cd4c4c0577853975b4d23745f63f39a Mon Sep 17 00:00:00 2001
From: Miloslav Trmac <mitr@fedoraproject.org>
Date: Apr 27 2005 23:07:16 +0000
Subject: %changelog

Wed Apr 27 2005 Miloslav Trmac <mitr@redhat.com> - 1.95-2
- Fix build with gcc 4 (#156132)
- Require /sbin/install-info for scriptlets (#155698)
- Don't ship %{_bindir}/VCLocalRules (#75645)

---

diff --git a/festival.spec b/festival.spec
index e4f6d22..0215112 100644
--- a/festival.spec
+++ b/festival.spec
@@ -1,7 +1,7 @@
 Name: festival
 Summary: A free speech synthesizer
 Version: 1.95
-Release: 1
+Release: 2
 
 # we ship the 1.4.2 docs for now.
 %define docversion 1.4.2
@@ -62,6 +62,10 @@ Patch2: festival-buildroot.patch
 # Use shared libraries
 Patch3: festival-1.95-shared-build.patch
 
+# Somebody please teach the source code what C++ looks like this millenium
+Patch4: speech_tools-1.2.95-gcc4.patch
+Patch5: festival-1.95-gcc4.patch
+
 # mattdm: this is a hack to make the shared libraries build with actual
 # sonames. I'm not sure I'm doing the right thing here, but this *does*
 # make it work. Someone should double check me.
@@ -74,6 +78,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-root
 # Try turning this off.
 # ExclusiveArch: i386 sparc
 # readlink from kpathsea
+Requires(post): /sbin/install-info
+Requires(postun): /sbin/install-info
 BuildRequires: tetex
 BuildRequires: libtermcap-devel
 
@@ -108,6 +114,8 @@ ln -sf festival/speech_tools ../speech_tools
 %patch1 -p1 -b .americandefault
 %patch2 -p1
 %patch3 -p1
+%patch4 -p0
+%patch5 -p1
 %patch30 -p1 -b .soname
 
 # zero length
@@ -166,7 +174,7 @@ rm -f lib/Makefile lib/*.fsstnd lib/*.americandefault bin/Makefile
 mv lib/* $RPM_BUILD_ROOT%{_datadir}/festival
 mv bin/* $RPM_BUILD_ROOT%{_bindir}
 # We want the real festival, not the wrapper script
-rm -f $RPM_BUILD_ROOT%{_bindir}/Makefile
+rm -f $RPM_BUILD_ROOT%{_bindir}/{Makefile,VCLocalRules}
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
 cp -a doc/*.1 $RPM_BUILD_ROOT%{_mandir}/man1
 
@@ -269,6 +277,11 @@ fi
 %{_includedir}/festival/*
 
 %changelog
+* Wed Apr 27 2005 Miloslav Trmac <mitr@redhat.com> - 1.95-2
+- Fix build with gcc 4 (#156132)
+- Require /sbin/install-info for scriptlets (#155698)
+- Don't ship %{_bindir}/VCLocalRules (#75645)
+
 * Fri Feb 25 2005  <jrb@redhat.com> - 1.95-1
 - patch from Matthew Miller to update to 1.95.  Full changelog below