- move decoders to subpackages

- change rel. name to more propery

Changed files:
    moc.spec -> 1.25

diff --git a/moc.spec b/moc.spec
index f4cec1762f87f7d566ae4bf11b367820017a7ee1..fc5a2eb88e7e6687b6418f133d5e656978cdce13 100644 (file)
--- a/moc.spec
+++ b/moc.spec
@@ -1,15 +1,21 @@
+# FIX:
+# - ffmpeg decoder don't want to install
+#
+# bconds:
+%bcond_without home_etc    # disable HOME_ETC support
+#
 
-# I know, console<->terminal
-%define        _beta   beta1
+%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:       1%{_beta}
+Release:       0.%{_status}.1
 License:       GPL
 Group:         Applications/Sound
-Source0:       ftp://ftp.daper.net/pub/soft/moc/unstable/%{name}-%{version}-%{_beta}.tar.bz2
+Source0:       ftp://ftp.daper.net/pub/soft/moc/unstable/%{name}-%{version}-%{_status}.tar.bz2
 # Source0-md5: c5f534e5ee0cc080f0c0c89f5a8c53cd
+Patch0:                %{name}-home_etc.patch
 URL:           http://moc.daper.net/
 BuildRequires: alsa-lib-devel
 BuildRequires: autoconf
@@ -30,6 +36,7 @@ BuildRequires:        pkgconfig
 BuildRequires: taglib-devel >= 1.3.1
 BuildRequires: zlib-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+%define        _decoder_plugins        %{_libdir}/%{name}/decoder_plugins
 
 %description
 MOC is a console audio player with simple ncurses interface in
@@ -46,8 +53,109 @@ bibliotek
 siê w prostym odtwarzaczu audio. Teraz tak¿e obs³uguje strumienie
 sieciowe (shoutcast, icecast, HTTP, FTP).
 
+%package mp3
+Summary:       MP3 decoder for MoC - Music on Console
+Summary(pl):   Dekoder MP3 dla MOC
+Group:         Applications/Sound
+Requires:       %{name} = %{version}-%{release}
+Requires:      libmad 
+Requires:      libid3tag
+Provides:       %{name}-input = %{version}-%{release}
+
+%description mp3
+This package contains the MP3 decoder.
+After install you should reload MOC player.
+
+%description -l pl
+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(pl):   Dekoder Musepack (MPC) dla MOC
+Group:         Applications/Sound
+Requires:      libmpcdec 
+Requires:      taglib
+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.
+
+%description musepack -l pl
+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(pl):   Dekoder Ogg dla MOC
+Group:         Applications/Sound
+Requires:      libogg 
+Requires:      libvorbis
+Requires:       %{name} = %{version}-%{release}
+Provides:       %{name}-input = %{version}-%{release}
+
+%description ogg
+This package contains the ogg decoder
+After install you should reload MOC player.
+
+%description ogg -l pl
+Ten pakiet zawiera dekodowanie formatu Ogg
+Po zainstalowaniu nale¿y uruchomiæ ponownie MOC
+
+%package flac
+Summary:       FLAC decoder for MoC - Music on Console
+Summary(pl):   Dekoder FLAC dla MOC
+Group:         Applications/Sound
+Requires:      flac
+Requires:       %{name} = %{version}-%{release}
+Provides:       %{name}-input = %{version}-%{release}
+
+%description flac
+This package contains the FLAC decoder
+After install you should reload MOC player.
+
+%description flac -l pl
+Ten pakiet zawiera dekodowanie formatu FLAC
+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
+Group:         Applications/Sound
+Requires:      libsndfile
+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.
+
+%description sndfile -l pl
+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(pl):   Dekoder formatu Speex dla MOC
+Group:         Applications/Sound
+Requires:      speex
+Requires:       %{name} = %{version}-%{release}
+Provides:       %{name}-input = %{version}-%{release}
+
+%description speex
+This package contains the Speex decoder
+After install you should reload MOC player.
+
+%description speex -l pl
+Ten pakiet zapewnia dekodowanie formatu Speex
+Po zainstalowaniu nale¿y uruchomiæ ponownie MOC
+
+
 %prep
-%setup -q -n %{name}-%{version}-%{_beta}
+%setup -q -n %{name}-%{version}-%{_status}
+%{?with_home_etc:%patch0 -p1}
 
 %build
 CFLAGS="-I/usr/include/ncurses %{rpmcflags}"
@@ -68,7 +176,7 @@ install -d $RPM_BUILD_ROOT
        DESTDIR=$RPM_BUILD_ROOT
 
 rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}
-rm -f $RPM_BUILD_ROOT%{_libdir}/moc/decoder_plugins/lib*.la
+rm -f $RPM_BUILD_ROOT%{_decoder_plugins}/lib*.la
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -78,7 +186,31 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS NEWS README THANKS TODO *.example
 %attr(755,root,root) %{_bindir}/*
 %dir %{_libdir}/moc
-%dir %{_libdir}/moc/decoder_plugins
-%attr(755,root,root) %{_libdir}/moc/decoder_plugins/lib*.so
+#%dir %{_libdir}/moc/decoder_plugins
+#%attr(755,root,root) %{_libdir}/moc/decoder_plugins/lib*.so
 %{_datadir}/%{name}
 %{_mandir}/man1/mocp*
+
+%files musepack
+%defattr(-, root, root)
+%{_decoder_plugins}/libmusepack_decoder.*
+
+%files flac
+%defattr(-, root, root)
+%{_decoder_plugins}/libflac_decoder.*
+
+%files mp3
+%defattr(-, root, root)
+%{_decoder_plugins}/libmp3_decoder.*
+
+%files ogg
+%defattr(-, root, root)
+%{_decoder_plugins}/libvorbis_decoder.*
+
+%files sndfile
+%defattr(-, root, root)
+%{_decoder_plugins}/libsndfile_formats_decoder.*
+
+%files speex
+%defattr(-, root, root)
+%{_decoder_plugins}/libspeex_decoder.*