- up to 2.4.0 stable

- ffmpeg plugin move into subpackage

Changed files:
    moc.spec -> 1.28

diff --git a/moc.spec b/moc.spec
index 71227625a157aa9d16f81af9d8661c3ba9a5f7e1..3ea28a868de3b9f5c1695afee4aed08806b39945 100644 (file)
--- a/moc.spec
+++ b/moc.spec
@@ -1,26 +1,24 @@
-# FIX:
-# - ffmpeg decoder doesn't want to install
 #
 # bconds:
 %bcond_without home_etc    # disable HOME_ETC support
 #
 
-%define        _status beta2
 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
+Release:       1
 License:       GPL
 Group:         Applications/Sound
-Source0:       ftp://ftp.daper.net/pub/soft/moc/unstable/%{name}-%{version}-%{_status}.tar.bz2
-# Source0-md5: cbdc3139ad077130646f4763e6a4994d
+Source0:       ftp://ftp.daper.net/pub/soft/%{name}/stable/%{name}-%{version}.tar.bz2
+# Source0-md5: 5b31665390fb0b30d19dadec4e90abb8
 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: flac-devel
 BuildRequires: libao-devel
 BuildRequires: libid3tag-devel
@@ -110,8 +108,20 @@ Provides:  %{name}-input = %{version}-%{release}
 This package contains the FLAC decoder.
 After install you should reload MOC player.
 
-%description flac -l pl
-Ten pakiet zawiera dekodowanie formatu FLAC.
+%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
@@ -145,7 +155,7 @@ Ten pakiet zapewnia dekodowanie formatu Speex.
 Po zainstalowaniu nale¿y uruchomiæ ponownie MOC.
 
 %prep
-%setup -q -n %{name}-%{version}-%{_status}
+%setup -q
 %{?with_home_etc:%patch0 -p1}
 
 %build
@@ -189,6 +199,10 @@ rm -rf $RPM_BUILD_ROOT
 %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*