Author: rdieter Update of /cvs/free/rpms/xine-lib-extras-freeworld/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv26014 Modified Files: xine-lib-extras-freeworld.spec Log Message: sync changes from EL-5 branch Index: xine-lib-extras-freeworld.spec =================================================================== RCS file: /cvs/free/rpms/xine-lib-extras-freeworld/devel/xine-lib-extras-freeworld.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- xine-lib-extras-freeworld.spec 4 Sep 2008 12:23:10 -0000 1.4 +++ xine-lib-extras-freeworld.spec 23 Sep 2008 13:16:56 -0000 1.5 @@ -3,6 +3,10 @@ %define abiver 1.24 +%if 0%{?fedora} > 6 +%define _with_external_ffmpeg --with-external-ffmpeg +%endif + Name: xine-lib-extras-freeworld Summary: Non-free extra codecs for the Xine library Version: 1.1.15 @@ -19,7 +23,7 @@ BuildRequires: zlib-devel BuildRequires: gawk # External libs -BuildRequires: ffmpeg-devel >= 0.4.9-0.22.20060804 +%{?_with_external_ffmpeg:BuildRequires: ffmpeg-devel >= 0.4.9-0.22.20060804} BuildRequires: a52dec-devel BuildRequires: libmad-devel BuildRequires: libdca-devel @@ -65,7 +69,6 @@ # Keep order of options the same as in ./configure --help for easy maintenance %configure \ --disable-dependency-tracking \ - --with-external-ffmpeg \ --enable-ipv6 \ --disable-opengl \ --disable-xvmc \ @@ -85,7 +88,7 @@ --disable-gnomevfs \ --disable-gdkpixbuf \ --disable-samba \ - --with-external-ffmpeg \ + %{?_with_external_ffmpeg} \ --with-external-a52dec \ --with-external-libmad \ --with-external-libdts