[gnome-speech] - Merge-review cleanup (#225836)

[paragn]

commit 56398f84aed1bb629b13780266261f324d920215
Author: paragn <paragn at fedoraproject.org>
Date:   Wed Oct 13 11:52:26 2010 +0530

    - Merge-review cleanup (#225836)

 gnome-speech.spec |   30 ++++++++++++++----------------
 1 files changed, 14 insertions(+), 16 deletions(-)
---
diff --git a/gnome-speech.spec b/gnome-speech.spec
index 908bff0..bf7d37e 100644
--- a/gnome-speech.spec
+++ b/gnome-speech.spec
@@ -3,19 +3,22 @@
 Summary: GNOME Text to Speech
 Name: gnome-speech
 Version: 0.4.25
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: LGPLv2+
-Group: Desktop/Accessibility
+Group: Applications/System
 URL: http://www.gnome.org/
 Source0: http://download.gnome.org/sources/gnome-speech/0.4/gnome-speech-%{version}.tar.bz2
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 BuildRequires: pkgconfig
 BuildRequires: autoconf, automake, gettext, libtool
 BuildRequires: libbonobo-devel
 BuildRequires: espeak-devel
+
+# Fedora specific patches
+
 Patch1: gnome-speech-0.3.5-no-gnome-common.patch
 Patch2: gnome-speech-0.4.18-dont-fail.patch
-Requires: festival >= 1.96-0.11
+
+Requires: festival
 
 %description
 The GNOME Speech library provides a simple general API for 
@@ -26,8 +29,6 @@ producing text-to-speech output.
 Summary:	The files needed for developing an app using gnome-speech
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
-Requires:	libbonobo-devel
-Requires:	pkgconfig
 
 %description devel
 The gnome-speech-devel package contains files needed for developing
@@ -51,18 +52,12 @@ with eSpeak.
 
 %build
 autoreconf -f -i
-%configure --with-java-home=no --with-jab-dir="" --with-espeak-dir=""
-make
+%configure --with-java-home=no --with-jab-dir="" --with-espeak-dir="" --disable-static
+make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-%makeinstall
-
-find $RPM_BUILD_ROOT -name '*.la' |xargs /bin/rm
-# Remove this as it does not build correctly right now.
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
+find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
 %post -p /sbin/ldconfig
 
@@ -92,6 +87,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Oct 06 2010 Parag Nemade <paragn AT fedoraproject.org> - 0.4.25-4
+- Merge-review cleanup (#225836)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.25-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild