- added ffmpeg071.patch

[packages/moc.git] / moc.spec

diff --git a/moc.spec b/moc.spec
index 4c31b5825168eb9f797462ded206f0effbcb0401..a48f19382c409b9d4706ca288ecbbb9c5614f09a 100644 (file)
--- a/moc.spec
+++ b/moc.spec
@@ -1,25 +1,28 @@
 #
 # 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:       2
+Release:       8
 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
+Patch2:                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
@@ -205,6 +208,18 @@ należy uruchomić ponownie MOC.
 %prep
 %setup -q
 %{?with_home_etc:%patch0 -p1}
+%patch1 -p1
+%patch2 -p2
+
+rm -rf libltdl
+%{__sed} -i -e '/SUBDIRS/ s/libltdl//' Makefile.am
+%{__sed} -i -e '
+       /LT_CONFIG_LTDL_DIR/d
+       /LT_INIT/d
+       /LTDL_INIT/d
+       /AC_CONFIG_AUX_DIR/d
+       /AC_CONFIG_MACRO_DIR/d
+' configure.in
 
 %build
 CFLAGS="-I/usr/include/ncurses %{rpmcflags}"
@@ -214,9 +229,11 @@ CFLAGS="-I/usr/include/ncurses %{rpmcflags}"
 %{__autoconf}
 %{__automake}
 %configure \
+       %{!?with_ffmpeg:--without-ffmpeg} \
        --disable-debug
 
-%{__make}
+%{__make} \
+       LIBLTDL=-lltdl
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -248,9 +265,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)