X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;ds=sidebyside;f=espeak.spec;h=f89f3d6ec3415e839453fb40d514b007ac3879ae;hb=8f9f684f5cfb61be0de3e7930191b440b0ea86c6;hp=320c2ee1a494f0dbdcf1d9a9269e4a3d5d10d60d;hpb=819d3063861dee48026e5036037d52f4efc012f9;p=packages%2Fespeak.git

diff --git a/espeak.spec b/espeak.spec
index 320c2ee..f89f3d6 100644
--- a/espeak.spec
+++ b/espeak.spec
@@ -1,22 +1,15 @@
-#
-# Conditional build:
-%bcond_without	static_libs # don't build static libraries
-#
 Summary:	eSpeak - speech synthesizer for English and other languages
-Summary(pl.UTF-8):   eSpeak - syntezator mowy dla języka angielskiego i innych
+Summary(pl.UTF-8):	eSpeak - syntezator mowy dla języka angielskiego i innych
 Name:		espeak
-Version:	1.19
+Version:	1.25
 Release:	1
 License:	GPL v2
 Group:		Applications
 Source0:	http://dl.sourceforge.net/espeak/%{name}-%{version}-source.zip
-# Source0-md5:	49d70bd49f7cc7c1151f5973ee26c152
-Patch0:		%{name}-ac_am.patch
+# Source0-md5:	f626d1d7b07213a90a64ab11539a2f6e
+Patch0:		%{name}-Makefile.patch
 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}
@@ -84,7 +77,7 @@ bezpośrednio z przeglądarki Konqueror i edytora Kate.
 
 %package libs
 Summary:	eSpeak shared libraries
-Summary(pl.UTF-8):   eSpeak - biblioteki
+Summary(pl.UTF-8):	eSpeak - biblioteki
 Group:		Libraries
 Obsoletes:	speak-libs
 
@@ -96,7 +89,7 @@ eSpeak - biblioteki dzielone.
 
 %package devel
 Summary:	eSpeak - development files
-Summary(pl.UTF-8):   eSpeak - pliki dla programistów
+Summary(pl.UTF-8):	eSpeak - pliki dla programistów
 Group:		Development/Libraries
 Requires:	%{name}-libs = %{version}-%{release}
 
@@ -108,7 +101,7 @@ eSpeak - pliki dla programistów.
 
 %package static
 Summary:	eSpeak - static libraries
-Summary(pl.UTF-8):   eSpeak - biblioteki statyczne
+Summary(pl.UTF-8):	eSpeak - biblioteki statyczne
 Group:		Development/Libraries
 Requires:	%{name}-devel = %{version}-%{release}
 
@@ -125,26 +118,22 @@ eSpeak - biblioteki statyczne.
 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}
+%{__make} -C src \
+	CXX="%{__cxx}" \
+	CXXFLAGS="%{rpmcxxflags}" \
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT
+%{__make} -C src install \
+	DESTDIR=$RPM_BUILD_ROOT \
+	LIBDIR="%{_libdir}"
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post libs -p /sbin/ldconfig
-%postun libs -p /sbin/ldconfig
+%post	libs -p /sbin/ldconfig
+%postun	libs -p /sbin/ldconfig
 
 %files
 %defattr(644,root,root,755)
@@ -152,15 +141,17 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/*
 %dir %{_datadir}/%{name}-data
 %dir %{_datadir}/%{name}-data/voices
-%dir %{_datadir}/%{name}-data/voices/en
 %{_datadir}/%{name}-data/voices/af
+%{_datadir}/%{name}-data/voices/cs
 %{_datadir}/%{name}-data/voices/cy
 %{_datadir}/%{name}-data/voices/de
 %{_datadir}/%{name}-data/voices/default
 %{_datadir}/%{name}-data/voices/el
+%dir %{_datadir}/%{name}-data/voices/en
 %{_datadir}/%{name}-data/voices/en/en
 %{_datadir}/%{name}-data/voices/en/en-n
 %{_datadir}/%{name}-data/voices/en/en-r
+%{_datadir}/%{name}-data/voices/en/en-sc
 %{_datadir}/%{name}-data/voices/en/en-wm
 %{_datadir}/%{name}-data/voices/en/en-croak
 %{_datadir}/%{name}-data/voices/en/en-rp
@@ -168,22 +159,57 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}-data/voices/es
 %{_datadir}/%{name}-data/voices/fi
 %{_datadir}/%{name}-data/voices/fr
-%{_datadir}/%{name}-data/voices/fr-ca
-%{_datadir}/%{name}-data/fr_dict
-%{_datadir}/%{name}-data/hi_dict
+#%%{_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
 %{_datadir}/%{name}-data/voices/pl
 %{_datadir}/%{name}-data/voices/pt
+%{_datadir}/%{name}-data/voices/pt-pt
 %{_datadir}/%{name}-data/voices/ro
 %{_datadir}/%{name}-data/voices/ru
+%{_datadir}/%{name}-data/voices/sk
 %{_datadir}/%{name}-data/voices/sv
+%{_datadir}/%{name}-data/voices/sw
 %{_datadir}/%{name}-data/voices/vi
+%{_datadir}/%{name}-data/voices/zhy
+%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-de7
+%{_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
+%{_datadir}/%{name}-data/voices/mb/mb-pl1-en
+%{_datadir}/%{name}-data/voices/mb/mb-ro1
+%{_datadir}/%{name}-data/voices/mb/mb-ro1-en
+%{_datadir}/%{name}-data/voices/mb/mb-sw1
+%{_datadir}/%{name}-data/voices/mb/mb-sw1-en
+%{_datadir}/%{name}-data/voices/mb/mb-sw2
+%{_datadir}/%{name}-data/voices/mb/mb-sw2-en
+%{_datadir}/%{name}-data/voices/mb/mb-us1
+%{_datadir}/%{name}-data/voices/mb/mb-us2
+%{_datadir}/%{name}-data/voices/mb/mb-us3
 %dir %{_datadir}/%{name}-data/soundicons
 %{_datadir}/%{name}-data/af_dict
 %{_datadir}/%{name}-data/config
+%{_datadir}/%{name}-data/cs_dict
 %{_datadir}/%{name}-data/cy_dict
 %{_datadir}/%{name}-data/de_dict
 %{_datadir}/%{name}-data/en_dict
@@ -191,6 +217,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}-data/el_dict
 %{_datadir}/%{name}-data/es_dict
 %{_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
 %{_datadir}/%{name}-data/no_dict
@@ -201,8 +231,27 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}-data/pt_dict
 %{_datadir}/%{name}-data/ro_dict
 %{_datadir}/%{name}-data/ru_dict
+%{_datadir}/%{name}-data/sk_dict
 %{_datadir}/%{name}-data/sv_dict
+%{_datadir}/%{name}-data/sw_dict
 %{_datadir}/%{name}-data/vi_dict
+%{_datadir}/%{name}-data/zhy_dict
+%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
+%{_datadir}/%{name}-data/mbrola_ph/sv_phtrans
+%{_datadir}/%{name}-data/mbrola_ph/us3_phtrans
+%{_datadir}/%{name}-data/mbrola_ph/us_phtrans
 %dir %{_datadir}/%{name}-data/voices/!v
 %{_datadir}/%{name}-data/voices/!v/!variant1
 %{_datadir}/%{name}-data/voices/!v/!variant11
@@ -213,6 +262,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}-data/voices/!v/!variant3
 %{_datadir}/%{name}-data/voices/!v/!variant4
 %{_datadir}/%{name}-data/voices/!v/!variant5
+%{_datadir}/%{name}-data/voices/!v/!variant6
 
 %files libs
 %defattr(644,root,root,755)
@@ -220,12 +270,9 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(644,root,root,755)
-%{_includedir}/*
 %attr(755,root,root) %{_libdir}/lib*.so
-%{_libdir}/lib*.la
+%{_includedir}/*
 
-%if %{with static_libs}
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/lib*.a
-%endif