diff --git a/audacity.spec b/audacity.spec index 0383073..b7dbaff 100644 --- a/audacity.spec +++ b/audacity.spec @@ -18,7 +18,6 @@ %define _use_internal_dependency_generator 0 %define __find_requires %{wx_requires} -%bcond_with restricted %bcond_with mad %bcond_with lame %bcond_with twolame @@ -54,6 +53,9 @@ BuildRequires: pkgconfig(flac++) BuildRequires: pkgconfig(gtk+-2.0) >= 2.4.0 BuildRequires: pkgconfig(id3tag) BuildRequires: pkgconfig(jack) +BuildRequires: pkgconfig(libavcodec) >= 51.53 +BuildRequires: pkgconfig(libavformat) >= 52.12 +BuildRequires: pkgconfig(libavutil) BuildRequires: pkgconfig(ogg) BuildRequires: pkgconfig(shared-mime-info) BuildRequires: pkgconfig(sndfile) @@ -70,11 +72,6 @@ Recommends: libavcodec Recommends: libavformat Recommends: libavutil Recommends: libmp3lame0 -%if 0%{?suse_version} > 1320 || (0%{?suse_version} == 1315 && 0%{?is_opensuse}) || %{with restricted} -BuildRequires: pkgconfig(libavcodec) >= 51.53 -BuildRequires: pkgconfig(libavformat) >= 52.12 -BuildRequires: pkgconfig(libavutil) -%endif %if %{with mad} BuildRequires: pkgconfig(mad) %endif @@ -102,7 +99,7 @@ than the physical memory size of your computer. %patch3 cp -f %{SOURCE1} LICENSE_NYQUIST.txt # Make sure we use the system versions. -rm -rf lib-src/{expat,libvamp,libsoxr}/ +rm -rf lib-src/{expat,libvamp,libsoxr,ffmpeg}/ %if %{with lame} rm -rf lib-src/lame/ %endif