X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=moc.spec;h=bc96502a8f9647290675f2cd314ca513593af319;hb=aadd565e62c7bfee7d681ec33d59fa682c282812;hp=03674d055bda0c693764d13b21a8a214ea1a67ca;hpb=a0f6fa218aea14d0f0bb4ee2f4b757f86de865e2;p=packages%2Fmoc.git

diff --git a/moc.spec b/moc.spec
index 03674d0..bc96502 100644
--- a/moc.spec
+++ b/moc.spec
@@ -1,26 +1,27 @@
 #
 # bconds:
 %bcond_without	home_etc    # disable 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:	3
+Release:	10
 License:	GPL
 Group:		Applications/Sound
 Source0:	ftp://ftp.daper.net/pub/soft/moc/stable/%{name}-%{version}.tar.bz2
 # Source0-md5:	647c770a5542a4ae5437386807a89796
 Patch0:		%{name}-home_etc.patch
-Patch1:		ncurses-tinfo.patch
+Patch1:		ffmpeg071.patch
 URL:		http://moc.daper.net/
 BuildRequires:	a52dec-libs-devel
 BuildRequires:	alsa-lib-devel
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	curl-devel
-BuildRequires:	ffmpeg-devel >= 0.4.9-4.20080822.1
+%{?with_ffmpeg:BuildRequires:	ffmpeg-devel >= 0.4.9-4.20080822.1}
 BuildRequires:	flac-devel >= 1.1.3
 BuildRequires:	libao-devel
 BuildRequires:	libid3tag-devel
@@ -206,8 +207,7 @@ należy uruchomić ponownie MOC.
 %prep
 %setup -q
 %{?with_home_etc:%patch0 -p1}
-%patch1 -p1
-
+%patch1 -p2
 
 rm -rf libltdl
 %{__sed} -i -e '/SUBDIRS/ s/libltdl//' Makefile.am
@@ -227,6 +227,7 @@ CFLAGS="-I/usr/include/ncurses %{rpmcflags}"
 %{__autoconf}
 %{__automake}
 %configure \
+	%{!?with_ffmpeg:--without-ffmpeg} \
 	--disable-debug
 
 %{__make} \
@@ -262,9 +263,11 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_decoder_plugins}/libflac_decoder.so*
 
+%if %{with ffmpeg}
 %files ffmpeg
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_decoder_plugins}/libffmpeg_decoder.so
+%endif
 
 %files mp3
 %defattr(644,root,root,755)