Author: rdieter Update of /cvs/free/rpms/kdemultimedia-extras-freeworld/F-8 In directory se02.es.rpmfusion.net:/tmp/cvs-serv11710 Modified Files: kdemultimedia-extras-freeworld.spec Log Message: fix/tighten akode (build)deps omit ffmpeg support, for now (until akode is fixed) Index: kdemultimedia-extras-freeworld.spec =================================================================== RCS file: /cvs/free/rpms/kdemultimedia-extras-freeworld/F-8/kdemultimedia-extras-freeworld.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- kdemultimedia-extras-freeworld.spec 3 Oct 2008 13:59:18 -0000 1.1 +++ kdemultimedia-extras-freeworld.spec 3 Oct 2008 16:14:47 -0000 1.2 @@ -1,4 +1,10 @@ +# Until akode is fixed -- Rex +#if 0%{?fedora} > 4 +%if 0 +%define ffmpeg 1 +%endif + # For the files list and SELinux scriptlets. %define libmpeg %{_libdir}/libmpeg-0.3.0.so @@ -21,9 +27,16 @@ Requires: kdemultimedia-extras >= 6:%{version} BuildRequires: kdelibs-devel >= 6:%{version} %endif -Requires: akode-extras Requires(hint): xine-lib-extras-freeworld +BuildRequires: akode-mpeg_decoder +Requires: akode-mpeg_decoder + +%if 0%{?ffmpeg} +BuildRequires: akode-ffmpeg_decoder +Requires: akode-ffmpeg_decoder +%endif + Obsoletes: kdemultimedia-extras < 6:3.5.0-0.lvn.2 Provides: kdemultimedia-mp3 = %{epoch}:%{version}-%{release} @@ -37,7 +50,7 @@ %if 0%{?fedora} > 4 || 0%{?rhel} > 4 BuildRequires: libXxf86dga-devel libXxf86vm-devel %endif -BuildRequires: akode-devel akode-extras +BuildRequires: akode-devel BuildRequires: taglib-devel libmad-devel lame-devel %description @@ -150,7 +163,7 @@ %{_libdir}/mcop/SplayPlayObject.mcopclass %{_libdir}/mcop/WAVPlayObject.mcopclass %{_libdir}/mcop/akodeMPEGPlayObject.mcopclass -%if 0%{?fedora} > 4 +%if 0%{?ffmpeg} %{_libdir}/mcop/akodeFFMPEGPlayObject.mcopclass %endif ## FIXME: devel-type stuff?, omit from packaging? -- Rex