-# FIX:
-# - ffmpeg decoder doesn't want to install
#
# bconds:
%bcond_without home_etc # disable HOME_ETC support
#
-
-%define _status beta1
Summary: Console audio player with simple ncurses interface
Summary(pl): Konsolowy odtwarzacz audio z prostym interfejsem ncurses
Name: moc
-Version: 2.4.0
-Release: 0.%{_status}.1
+Version: 2.4.1
+Release: 2
License: GPL
Group: Applications/Sound
-Source0: ftp://ftp.daper.net/pub/soft/moc/unstable/%{name}-%{version}-%{_status}.tar.bz2
-# Source0-md5: c5f534e5ee0cc080f0c0c89f5a8c53cd
+Source0: ftp://ftp.daper.net/pub/soft/moc/stable/%{name}-%{version}.tar.bz2
+# Source0-md5: 7b760a9c05d3f50781d06ed2d83aaee8
Patch0: %{name}-home_etc.patch
URL: http://moc.daper.net/
BuildRequires: alsa-lib-devel
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: curl-devel
+BuildRequires: ffmpeg-devel
+BuildRequires: speex-devel
BuildRequires: flac-devel
BuildRequires: libao-devel
BuildRequires: libid3tag-devel
%description ogg -l pl
Ten pakiet zawiera dekodowanie formatu Ogg.
-Po zainstalowaniu nale¿y uruchomiæ ponownie MOC
+Po zainstalowaniu nale¿y uruchomiæ ponownie MOC.
%package flac
Summary: FLAC decoder for MoC - Music on Console
Ten pakiet zawiera dekodowanie formatu FLAC.
Po zainstalowaniu nale¿y uruchomiæ ponownie MOC.
+%package ffmpeg
+Summary: ffmpeg decoder for MoC - Music on Console
+Summary(pl): 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.
+
+%description ffmpeg -l pl
+Ten pakiet zawiera modu³ dekoduj±cy pliki w formacie WMA (i nie tylko)
+Po zainstalowaniu nale¿y uruchomiæ ponownie MOC.
+
%package sndfile
Summary: Decoder of the sndfile formats for MoC - Music on Console
Summary(pl): Dekoder plików WAV/AIFF
Po zainstalowaniu nale¿y uruchomiæ ponownie MOC.
%prep
-%setup -q -n %{name}-%{version}-%{_status}
+%setup -q
%{?with_home_etc:%patch0 -p1}
%build
%defattr(644,root,root,755)
%attr(755,root,root) %{_decoder_plugins}/libflac_decoder.so*
+%files ffmpeg
+%defattr(664,root,root,755)
+%attr(755,root,root) %{_decoder_plugins}/libffmpeg_decoder.so
+
%files mp3
%defattr(644,root,root,755)
%attr(755,root,root) %{_decoder_plugins}/libmp3_decoder.so*