X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=moc.spec;h=28a3b99cc27b95b9b52568345c802711b420fd2c;hb=bfba6a3;hp=7ea5fee5faed613b90617a5d93316f8c0d60c703;hpb=a345b7c9fda466da633901cc5663bbcbd8593d0a;p=packages%2Fmoc.git

diff --git a/moc.spec b/moc.spec
index 7ea5fee..28a3b99 100644
--- a/moc.spec
+++ b/moc.spec
@@ -1,25 +1,28 @@
 #
 # bconds:
-%bcond_without	home_etc    # disable HOME_ETC support
+%bcond_with	home_etc    # enable HOME_ETC support
+%bcond_without	ffmpeg      # disable ffmpeg
 #
 Summary:	Console audio player with simple ncurses interface
+Summary(hu.UTF-8):	Konzolos audiólejátszó egyszerű ncurses felülettel
 Summary(pl.UTF-8):	Konsolowy odtwarzacz audio z prostym interfejsem ncurses
 Name:		moc
-Version:	2.4.1
-Release:	4
+Version:	2.5.0
+%define	pre	beta1
+Release:	0.%{pre}.2
 License:	GPL
 Group:		Applications/Sound
-Source0:	ftp://ftp.daper.net/pub/soft/moc/stable/%{name}-%{version}.tar.bz2
-# Source0-md5:	7b760a9c05d3f50781d06ed2d83aaee8
+#Source0:	ftp://ftp.daper.net/pub/soft/moc/stable/%{name}-%{version}.tar.bz2
+Source0:	ftp://ftp.daper.net/pub/soft/moc/unstable/%{name}-%{version}-%{pre}.tar.bz2
+# Source0-md5:	795ecba86847e082aa2f21937cc04804
 Patch0:		%{name}-home_etc.patch
-Patch1:		%{name}-flac.patch
 URL:		http://moc.daper.net/
+BuildRequires:	a52dec-libs-devel
 BuildRequires:	alsa-lib-devel
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	curl-devel
-BuildRequires:	ffmpeg-devel
-BuildRequires:	speex-devel
+%{?with_ffmpeg:BuildRequires:	ffmpeg-devel >= 0.4.9-4.20080822.1}
 BuildRequires:	flac-devel >= 1.1.3
 BuildRequires:	libao-devel
 BuildRequires:	libid3tag-devel
@@ -32,6 +35,7 @@ BuildRequires:	libtool
 BuildRequires:	libvorbis-devel
 BuildRequires:	ncurses-devel
 BuildRequires:	pkgconfig
+BuildRequires:	speex-devel
 BuildRequires:	taglib-devel >= 1.3.1
 BuildRequires:	zlib-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -41,89 +45,141 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %description
 MOC is a console audio player with simple ncurses interface in
 playmp3list style. It supports MP3, Ogg, FLAC, Musepack, Speex, WAV
-and other less popular formats supported by libsndfile. It has 
-all functions one may expect from simple audio player. Now it supports
-net streams (shoutcast, icecast, regular HTTP, FTP) also.
+and other less popular formats supported by libsndfile. It has all
+functions one may expect from simple audio player. Now it supports net
+streams (shoutcast, icecast, regular HTTP, FTP) also.
+
+%description -l hu.UTF-8
+MOC egy konzolos audió lejátszó egyszerű ncurses felülettel
+playmp3list stílusban. MP3, Ogg, FLAC, Musepack, Speex, WAV és egyéb
+kevésbé elterjedt formátumokat támogat a libsndfile segítségével.
+Minden funkció megtalálható a programban, amelyet egy egyszerű audió
+lejátszótól elvárható. A hálózati streameket (shoutcast, icecast,
+általános HTTP, FTP) is támogatja.
 
 %description -l pl.UTF-8
 MOC to konsolowy odtwarzacz audio z prostym interfejsem budzącym
-skojarzenia z playmp3list. Obsługuje formaty MP3, Ogg, FLAC, 
-Musepack, Speex, WAV oraz inne mniej popularne formaty wspierane przez
+skojarzenia z playmp3list. Obsługuje formaty MP3, Ogg, FLAC, Musepack,
+Speex, WAV oraz inne mniej popularne formaty wspierane przez
 bibliotekę libsndfile. Ma wszystkie funkcje, których można spodziewać
 się w prostym odtwarzaczu audio. Teraz także obsługuje strumienie
 sieciowe (shoutcast, icecast, HTTP, FTP).
 
+%package aac
+Summary:	AAC decoder for MoC - Music on Console
+Summary(hu.UTF-8):	AAC formátum támogatása MoC-hoz
+Summary(pl.UTF-8):	Dekoder AAC dla MOC
+Group:		Applications/Sound
+Requires:	%{name} = %{version}-%{release}
+Provides:	%{name}-input = %{version}-%{release}
+
+%description aac
+This package contains the AAC decoder. After install you should reload
+MOC player.
+
+%description aac -l hu.UTF-8
+Ez a csomag az AAC dekódert tartalmazza. A telepítés után a MOC
+lejátsztót újra kell indítani.
+
+%description aac -l pl.UTF-8
+Ten pakiet zawiera dekodowanie formatu AAC. Po zainstalowaniu należy
+uruchomić ponownie MOC.
+
 %package mp3
 Summary:	MP3 decoder for MoC - Music on Console
+Summary(hu.UTF-8):	MP3 formátum támogatása MoC-hoz
 Summary(pl.UTF-8):	Dekoder MP3 dla MOC
 Group:		Applications/Sound
 Requires:	%{name} = %{version}-%{release}
 Provides:	%{name}-input = %{version}-%{release}
 
 %description mp3
-This package contains the MP3 decoder.
-After install you should reload MOC player.
+This package contains the MP3 decoder. After install you should reload
+MOC player.
+
+%description mp3 -l hu.UTF-8
+Ez a csomag az MP3 dekódert tartalmazza. A telepítés után a MOC
+lejátsztót újra kell indítani.
 
 %description mp3 -l pl.UTF-8
-Ten pakiet zawiera dekodowanie formatu MP3.
-Po zainstalowaniu należy uruchomić ponownie MOC.
+Ten pakiet zawiera dekodowanie formatu MP3. Po zainstalowaniu należy
+uruchomić ponownie MOC.
 
 %package musepack
 Summary:	Musepack (MPC) decoder for MoC - Music on Console
+Summary(hu.UTF-8):	Musepack (MPC) dekóder MoC-hoz
 Summary(pl.UTF-8):	Dekoder Musepack (MPC) dla MOC
 Group:		Applications/Sound
 Requires:	%{name} = %{version}-%{release}
 Provides:	%{name}-input = %{version}-%{release}
 
 %description musepack
-This package contains the Musepack (MPC) decoder.
-After install you should reload MOC player.
+This package contains the Musepack (MPC) decoder. After install you
+should reload MOC player.
+
+%description musepack -l hu.UTF-8
+Ez a csomag a Musepack (MPC) dekódert tartalmazza. A telepítés után a
+MOC lejátsztót újra kell indítani.
 
 %description musepack -l pl.UTF-8
-Ten pakiet zawiera dekodowanie formatu Musepack (MPC).
-Po zainstalowaniu należy uruchomić ponownie MOC.
+Ten pakiet zawiera dekodowanie formatu Musepack (MPC). Po
+zainstalowaniu należy uruchomić ponownie MOC.
 
 %package ogg
 Summary:	Ogg decoder for MoC - Music on Console
+Summary(hu.UTF-8):	Ogg dekóder MOC-hoz
 Summary(pl.UTF-8):	Dekoder Ogg dla MOC
 Group:		Applications/Sound
 Requires:	%{name} = %{version}-%{release}
 Provides:	%{name}-input = %{version}-%{release}
 
 %description ogg
-This package contains the Ogg decoder.
-After install you should reload MOC player.
+This package contains the Ogg decoder. After install you should reload
+MOC player.
+
+%description ogg -l hu.UTF-8
+Ez a csomag az Ogg dekódert tartalmazza. A telepítés után a MOC
+lejátsztót újra kell indítani.
 
 %description ogg -l pl.UTF-8
-Ten pakiet zawiera dekodowanie formatu Ogg.
-Po zainstalowaniu należy uruchomić ponownie MOC.
+Ten pakiet zawiera dekodowanie formatu Ogg. Po zainstalowaniu należy
+uruchomić ponownie MOC.
 
 %package flac
 Summary:	FLAC decoder for MoC - Music on Console
+Summary(hu.UTF-8):	FLAC dekóder MOC-hoz
 Summary(pl.UTF-8):	Dekoder FLAC dla MOC
 Group:		Applications/Sound
 Requires:	%{name} = %{version}-%{release}
 Provides:	%{name}-input = %{version}-%{release}
 
 %description flac
-This package contains the FLAC decoder.
-After install you should reload MOC player.
+This package contains the FLAC decoder. After install you should
+reload MOC player.
+
+%description flac -l hu.UTF-8
+Ez a csomag az FLAC dekódert tartalmazza. A telepítés után a MOC
+lejátsztót újra kell indítani.
 
 %description flac -l pl.UTF-8
-Ten pakiet zawiera dekodowanie formatu FLAC.
-Po zainstalowaniu należy uruchomić ponownie MOC.
+Ten pakiet zawiera dekodowanie formatu FLAC. Po zainstalowaniu należy
+uruchomić ponownie MOC.
 
 %package ffmpeg
 Summary:	ffmpeg decoder for MoC - Music on Console
+Summary(hu.UTF-8):	ffmpeg dekóder MOC-hoz
 Summary(pl.UTF-8):	Dekoder ffmpeg dla MOC
 Group:		Applications/Sound
 Requires:	%{name} = %{version}-%{release}
 Provides:	%{name}-input = %{version}-%{release}
 
 %description ffmpeg
-This package contains module to decode WMA (and others) 
-files.
-After install you should reload MOC player.
+This package contains module to decode WMA (and others) files. After
+install you should reload MOC player.
+
+%description ffmpeg -l hu.UTF-8
+Ez a csomag az ffmpeg dekódert tartalmazza. A telepítés után a MOC
+lejátsztót újra kell indítani.
 
 %description ffmpeg -l pl.UTF-8
 Ten pakiet zawiera moduł dekodujący pliki w formacie WMA (i nie tylko)
@@ -131,49 +187,111 @@ Po zainstalowaniu należy uruchomić ponownie MOC.
 
 %package sndfile
 Summary:	Decoder of the sndfile formats for MoC - Music on Console
+Summary(hu.UTF-8):	sndfile dekóder MOC-hoz
 Summary(pl.UTF-8):	Dekoder plików WAV/AIFF
 Group:		Applications/Sound
 Requires:	%{name} = %{version}-%{release}
 Provides:	%{name}-input = %{version}-%{release}
 
 %description sndfile
-This package contains the decoders of sndfile.
-After install you should reload MOC player.
+This package contains the decoders of sndfile. After install you
+should reload MOC player.
+
+%description sndfile -l hu.UTF-8
+Ez a csomag az sndfile dekódert tartalmazza. A telepítés után a MOC
+lejátsztót újra kell indítani.
 
 %description sndfile -l pl.UTF-8
-Ten pakiet zapewnia dekodowanie plików WAV/AIFF.
-Po zainstalowaniu należy uruchomić ponownie MOC.
+Ten pakiet zapewnia dekodowanie plików WAV/AIFF. Po zainstalowaniu
+należy uruchomić ponownie MOC.
 
 %package speex
 Summary:	Speex decoder for MoC - Music on Console
+Summary(hu.UTF-8):	Speex dekóder MOC-hoz
 Summary(pl.UTF-8):	Dekoder formatu Speex dla MOC
 Group:		Applications/Sound
 Requires:	%{name} = %{version}-%{release}
 Provides:	%{name}-input = %{version}-%{release}
 
 %description speex
-This package contains the Speex decoder.
-After install you should reload MOC player.
+This package contains the Speex decoder. After install you should
+reload MOC player.
+
+%description speex -l hu.UTF-8
+Ez a csomag az speex dekódert tartalmazza. A telepítés után a MOC
+lejátsztót újra kell indítani.
 
 %description speex -l pl.UTF-8
-Ten pakiet zapewnia dekodowanie formatu Speex.
-Po zainstalowaniu należy uruchomić ponownie MOC.
+Ten pakiet zapewnia dekodowanie formatu Speex. Po zainstalowaniu
+należy uruchomić ponownie MOC.
+
+%package modplug
+Summary:	ModPlug decoder for MoC - Music on Console
+Summary(hu.UTF-8):	ModPlug dekóder MOC-hoz
+Summary(pl.UTF-8):	Dekoder formatów ModPlug dla MOC
+Group:		Applications/Sound
+Requires:	%{name} = %{version}-%{release}
+Provides:	%{name}-input = %{version}-%{release}
+
+%description modplug
+This package contains the ModPlug decoder. After install you should
+reload MOC player.
+
+%description modplug -l hu.UTF-8
+Ez a csomag az ModPlug dekódert tartalmazza. A telepítés után a MOC
+lejátsztót újra kell indítani.
+
+%description modplug -l pl.UTF-8
+Ten pakiet zapewnia dekodowanie formatów ModPlug. Po zainstalowaniu
+należy uruchomić ponownie MOC.
+
+%package wavpack
+Summary:	WavPack decoder for MoC - Music on Console
+Summary(hu.UTF-8):	WavPack dekóder MOC-hoz
+Summary(pl.UTF-8):	Dekoder formatu WavPack dla MOC
+Group:		Applications/Sound
+Requires:	%{name} = %{version}-%{release}
+Provides:	%{name}-input = %{version}-%{release}
+
+%description wavpack
+This package contains the WavPack decoder. After install you should
+reload MOC player.
+
+%description wavpack -l hu.UTF-8
+Ez a csomag az WavPack dekódert tartalmazza. A telepítés után a MOC
+lejátsztót újra kell indítani.
+
+%description wavpack -l pl.UTF-8
+Ten pakiet zapewnia dekodowanie formatu WavPack. Po zainstalowaniu
+należy uruchomić ponownie MOC.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}-%{pre}
 %{?with_home_etc:%patch0 -p1}
-%patch1 -p1
+
+rm -rf libltdl
+%{__sed} -i -e '/SUBDIRS/ s/libltdl//' Makefile.am
+%{__sed} -i -e '
+	/LT_CONFIG_LTDL_DIR/d
+	/LT_INIT/d
+	/LTDL_INIT/d
+	/AC_CONFIG_AUX_DIR/d
+	/AC_CONFIG_MACRO_DIR/d
+' configure.in
 
 %build
 CFLAGS="-I/usr/include/ncurses %{rpmcflags}"
 
+%{__libtoolize}
 %{__aclocal} -I m4
 %{__autoconf}
 %{__automake}
 %configure \
-	--disable-debug 
+	%{!?with_ffmpeg:--without-ffmpeg} \
+	--disable-debug
 
-%{__make}
+%{__make} \
+	LIBLTDL=-lltdl
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -205,9 +323,15 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_decoder_plugins}/libflac_decoder.so*
 
+%if %{with ffmpeg}
 %files ffmpeg
-%defattr(664,root,root,755)
+%defattr(644,root,root,755)
 %attr(755,root,root) %{_decoder_plugins}/libffmpeg_decoder.so
+%endif
+
+%files aac
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_decoder_plugins}/libaac_decoder.so*
 
 %files mp3
 %defattr(644,root,root,755)
@@ -219,8 +343,16 @@ rm -rf $RPM_BUILD_ROOT
 
 %files sndfile
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_decoder_plugins}/libsndfile_formats_decoder.so*
+%attr(755,root,root) %{_decoder_plugins}/libsndfile_decoder.so*
 
 %files speex
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_decoder_plugins}/libspeex_decoder.so*
+
+%files modplug
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_decoder_plugins}/libmodplug_decoder.so*
+
+%files wavpack
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_decoder_plugins}/libwavpack_decoder.so*