[audacity-freeworld/f31: 3/3] merge master except the ffmpeg conditional.
commit 9db26d6ac3ce1a55330f44d0c5dc290ff1dde0d3
Author: David Timms <dtimms(a)iinet.net.au>
Date: Fri Nov 29 23:01:59 2019 +1100
merge master except the ffmpeg conditional.
audacity-freeworld.spec | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
---
diff --git a/audacity-freeworld.spec b/audacity-freeworld.spec
index b57840c..0a6be4b 100644
--- a/audacity-freeworld.spec
+++ b/audacity-freeworld.spec
@@ -134,9 +134,8 @@ export WX_CONFIG=wx-config-3.0-gtk2
export WX_CONFIG=wx-config-3.0
%endif
-%if %{with ffmpeg} && %{with compat_ffmpeg}
export PKG_CONFIG_PATH=%{_libdir}/compat-ffmpeg28/pkgconfig
-%endif
+
%if 0%{?rhel} == 7
. /opt/rh/devtoolset-7/enable