SPECS: moc.spec - up to 2.4.0 stable - ffmpeg plugin move into sub...

[teodor]

Author: teodor                       Date: Thu Apr  6 08:38:28 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- up to 2.4.0 stable
- ffmpeg plugin move into subpackage

---- Files affected:
SPECS:
   moc.spec (1.27 -> 1.28) 

---- Diffs:

================================================================
Index: SPECS/moc.spec
diff -u SPECS/moc.spec:1.27 SPECS/moc.spec:1.28
--- SPECS/moc.spec:1.27	Mon Jan 30 09:36:33 2006
+++ SPECS/moc.spec	Thu Apr  6 10:38:23 2006
@@ -1,27 +1,25 @@
 # $Revision$, $Date$ 
-# 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
@@ -111,8 +109,20 @@
 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
@@ -146,7 +156,7 @@
 Po zainstalowaniu należy uruchomić ponownie MOC.
 
 %prep
-%setup -q -n %{name}-%{version}-%{_status}
+%setup -q
 %{?with_home_etc:%patch0 -p1}
 
 %build
@@ -190,6 +200,10 @@
 %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*
@@ -212,6 +226,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.28  2006/04/06 08:38:23  teodor
+- up to 2.4.0 stable
+- ffmpeg plugin move into subpackage
+
 Revision 1.27  2006/01/30 08:36:33  teodor
 - updated to 2.4.0-beta2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/moc.spec?r1=1.27&r2=1.28&f=u