- updated to 2.5.0-beta1

- disabled HOME_ETC support

diff --git a/ffmpeg071.patch b/ffmpeg071.patch
deleted file mode 100644 (file)
index f983eae..0000000
--- a/ffmpeg071.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From c8b7df0b53d53eb6c1724d49474b856b229acca4 Mon Sep 17 00:00:00 2001
-From: Eugeny A. Rostovtsev <real@altlinux.org>
-Date: Wed, 17 Aug 2011 06:22:09 +0000
-Subject: [PATCH] Fix for new ffmpeg
-
----
- moc/decoder_plugins/ffmpeg/ffmpeg.c |   18 +++++++++---------
- 1 files changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/moc/decoder_plugins/ffmpeg/ffmpeg.c b/moc/decoder_plugins/ffmpeg/ffmpeg.c
-index 1f78145..c4c1f57 100644
---- a/moc/decoder_plugins/ffmpeg/ffmpeg.c
-+++ b/moc/decoder_plugins/ffmpeg/ffmpeg.c
-@@ -86,14 +86,14 @@ static void ffmpeg_info (const char *file_name,
-       }
- 
-       if (tags_sel & TAGS_COMMENTS) {
--              if (ic->track != 0)
--                      info->track = ic->track;
--              if (ic->title[0] != 0)
--                      info->title = xstrdup (ic->title);
--              if (ic->author[0] != 0)
--                      info->artist = xstrdup (ic->author);
--              if (ic->album[0] != 0)
--                      info->album = xstrdup (ic->album);
-+              if (av_metadata_get(ic->metadata, "track", NULL, 0) != NULL)
-+                      info->track = atoi(av_metadata_get(ic->metadata, "track", NULL, 0)->value);
-+              if (av_metadata_get(ic->metadata, "title", NULL, 0) != NULL)
-+                      info->title = xstrdup (av_metadata_get(ic->metadata, "titke", NULL, 0)->value);
-+              if (av_metadata_get(ic->metadata, "author", NULL, 0) != NULL)
-+                      info->artist = xstrdup (av_metadata_get(ic->metadata, "author", NULL, 0)->value);
-+              if (av_metadata_get(ic->metadata, "album", NULL, 0) != NULL)
-+                      info->album = xstrdup (av_metadata_get(ic->metadata, "album", NULL, 0)->value);
-       }
- 
-       if (tags_sel & TAGS_TIME)
-@@ -132,7 +132,7 @@ static void *ffmpeg_open (const char *file)
-       av_read_play (data->ic);
-       for (i = 0; i < data->ic->nb_streams; i++) {
-               data->enc = data->ic->streams[i]->codec;
--              if (data->enc->codec_type == CODEC_TYPE_AUDIO) {
-+              if (data->enc->codec_type == AVMEDIA_TYPE_AUDIO) {
-                       audio_index = i;
-                       break;
-               }
--- 
-1.7.3.3
-

diff --git a/moc.spec b/moc.spec
index bc96502a8f9647290675f2cd314ca513593af319..e31bf70d233342e1d0a296e64fa33f04355f65f2 100644 (file)
--- a/moc.spec
+++ b/moc.spec
@@ -1,20 +1,21 @@
 #
 # 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.4
-Release:       10
+Version:       2.5.0
+%define        pre     beta1
+Release:       0.%{pre}.1
 License:       GPL
 Group:         Applications/Sound
-Source0:       ftp://ftp.daper.net/pub/soft/moc/stable/%{name}-%{version}.tar.bz2
-# Source0-md5: 647c770a5542a4ae5437386807a89796
+#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:                ffmpeg071.patch
 URL:           http://moc.daper.net/
 BuildRequires: a52dec-libs-devel
 BuildRequires: alsa-lib-devel
@@ -64,6 +65,26 @@ 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
@@ -204,10 +225,49 @@ lejátsztót újra kell indítani.
 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 -p2
 
 rm -rf libltdl
 %{__sed} -i -e '/SUBDIRS/ s/libltdl//' Makefile.am
@@ -269,6 +329,10 @@ rm -rf $RPM_BUILD_ROOT
 %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)
 %attr(755,root,root) %{_decoder_plugins}/libmp3_decoder.so*
@@ -279,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*