SPECS: espeak.spec - up to 1.2.24 - get rid of -ac_am.patch (cause...

[twittner]

Author: twittner                     Date: Sun May 13 18:26:39 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- up to 1.2.24
- get rid of -ac_am.patch (causes more harm than good for newer versions of espeak)

---- Files affected:
SPECS:
   espeak.spec (1.22 -> 1.23) 

---- Diffs:

================================================================
Index: SPECS/espeak.spec
diff -u SPECS/espeak.spec:1.22 SPECS/espeak.spec:1.23
--- SPECS/espeak.spec:1.22	Wed Apr 11 13:46:26 2007
+++ SPECS/espeak.spec	Sun May 13 20:26:34 2007
@@ -6,18 +6,14 @@
 Summary:	eSpeak - speech synthesizer for English and other languages
 Summary(pl.UTF-8):	eSpeak - syntezator mowy dla języka angielskiego i innych
 Name:		espeak
-Version:	1.22
-Release:	1
+Version:	1.24
+Release:	1	
 License:	GPL v2
 Group:		Applications
 Source0:	http://dl.sourceforge.net/espeak/%{name}-%{version}-source.zip
-# Source0-md5:	57e84d1afc0992f65c568dcddea73fee
-Patch0:		%{name}-ac_am.patch
+# Source0-md5:	6b00c634a18caca91e8c94ca36675304
 URL:		http://espeak.sourceforge.net/
-BuildRequires:	autoconf
-BuildRequires:	automake
 BuildRequires:	libstdc++-devel
-BuildRequires:	libtool
 BuildRequires:	portaudio-devel >= 19
 BuildRequires:	unzip
 Requires:	%{name}-libs = %{version}-%{release}
@@ -121,25 +117,22 @@
 
 %prep
 %setup -q -n %{name}-%{version}-source
-%patch0 -p1
 # remove pernicious headers to avoid using them during build instead of /usr/include/portaudio.h system header
 rm -f src/portaudio{18,19,}.h
 
 %build
-%{__libtoolize}
-%{__aclocal}
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-%configure \
-	--enable-static=%{?with_static_libs:yes}%{!?with_static_libs:no}
-%{__make}
+cd src
+%{__make} \
+	CXX="%{__cxx}" \
+	CXXFLAGS="%{rpmcxxflags}" \
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
+cd src
 %{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT
+	DESTDIR=$RPM_BUILD_ROOT \
+	LIBDIR="%{_libdir}"
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -171,9 +164,10 @@
 %{_datadir}/%{name}-data/voices/es
 %{_datadir}/%{name}-data/voices/fi
 %{_datadir}/%{name}-data/voices/fr
-%{_datadir}/%{name}-data/voices/fr-ca
-%{_datadir}/%{name}-data/voices/hu
+#%%{_datadir}/%{name}-data/voices/fr-ca
 %{_datadir}/%{name}-data/voices/hi
+%{_datadir}/%{name}-data/voices/hr
+%{_datadir}/%{name}-data/voices/hu
 %{_datadir}/%{name}-data/voices/it
 %{_datadir}/%{name}-data/voices/nl
 %{_datadir}/%{name}-data/voices/no
@@ -190,14 +184,19 @@
 %dir %{_datadir}/%{name}-data/voices/mb
 %{_datadir}/%{name}-data/voices/mb/mb-af1
 %{_datadir}/%{name}-data/voices/mb/mb-af1-en
+%{_datadir}/%{name}-data/voices/mb/mb-cr1
 %{_datadir}/%{name}-data/voices/mb/mb-cz2
 %{_datadir}/%{name}-data/voices/mb/mb-de4
+%{_datadir}/%{name}-data/voices/mb/mb-de5
 %{_datadir}/%{name}-data/voices/mb/mb-de4-en
+%{_datadir}/%{name}-data/voices/mb/mb-de5-en
 %{_datadir}/%{name}-data/voices/mb/mb-en1
 %{_datadir}/%{name}-data/voices/mb/mb-fr1
 %{_datadir}/%{name}-data/voices/mb/mb-fr1-en
 %{_datadir}/%{name}-data/voices/mb/mb-fr4
 %{_datadir}/%{name}-data/voices/mb/mb-fr4-en
+%{_datadir}/%{name}-data/voices/mb/mb-hu1
+%{_datadir}/%{name}-data/voices/mb/mb-hu1-en
 %{_datadir}/%{name}-data/voices/mb/mb-nl2
 %{_datadir}/%{name}-data/voices/mb/mb-nl2-en
 %{_datadir}/%{name}-data/voices/mb/mb-pl1
@@ -224,6 +223,7 @@
 %{_datadir}/%{name}-data/fi_dict
 %{_datadir}/%{name}-data/fr_dict
 %{_datadir}/%{name}-data/hi_dict
+%{_datadir}/%{name}-data/hr_dict
 %{_datadir}/%{name}-data/hu_dict
 %{_datadir}/%{name}-data/it_dict
 %{_datadir}/%{name}-data/nl_dict
@@ -243,10 +243,13 @@
 %dir %{_datadir}/%{name}-data/mbrola_ph
 %{_datadir}/%{name}-data/mbrola_ph/af1_phtrans
 %{_datadir}/%{name}-data/mbrola_ph/ca1_phtrans
+%{_datadir}/%{name}-data/mbrola_ph/cr1_phtrans
 %{_datadir}/%{name}-data/mbrola_ph/cs_phtrans
 %{_datadir}/%{name}-data/mbrola_ph/de4_phtrans
+%{_datadir}/%{name}-data/mbrola_ph/de5_phtrans
 %{_datadir}/%{name}-data/mbrola_ph/en1_phtrans
 %{_datadir}/%{name}-data/mbrola_ph/fr1_phtrans
+%{_datadir}/%{name}-data/mbrola_ph/hu1_phtrans
 %{_datadir}/%{name}-data/mbrola_ph/nl_phtrans
 %{_datadir}/%{name}-data/mbrola_ph/pl1_phtrans
 %{_datadir}/%{name}-data/mbrola_ph/ro1_phtrans
@@ -273,13 +276,10 @@
 %defattr(644,root,root,755)
 %{_includedir}/*
 %attr(755,root,root) %{_libdir}/lib*.so
-%{_libdir}/lib*.la
 
-%if %{with static_libs}
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/lib*.a
-%endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -287,6 +287,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.23  2007/05/13 18:26:34  twittner
+- up to 1.2.24
+- get rid of -ac_am.patch (causes more harm than good for newer versions of espeak)
+
 Revision 1.22  2007/04/11 11:46:26  twittner
 - rel. 1 - tested, works
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/espeak.spec?r1=1.22&r2=1.23&f=u