[audacity-freeworld] Revert 'Use compat-ffmpeg28 on Fedora 28+'

commit 24372df5af43b85de51055746eb7502db681bcfa Author: leigh123linux <leigh123linux(a)googlemail.com&gt; Date: Fri Apr 27 09:30:06 2018 +0100 Revert 'Use compat-ffmpeg28 on Fedora 28+' audacity-freeworld.spec | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) --- diff --git a/audacity-freeworld.spec b/audacity-freeworld.spec index dbd401a..08846a5 100644 --- a/audacity-freeworld.spec +++ b/audacity-freeworld.spec @@ -3,19 +3,13 @@ %bcond_without ffmpeg %bcond_with local_ffmpeg -%if 0%{?fedora} > 27 -%bcond_without compat_ffmpeg -%else -%bcond_with compat_ffmpeg -%endif - #global commit0 53a5c930a4b5b053ab06a8b975458fc51cf41f6c #global shortcommit0 #(c=#{commit0}; echo ${c:0:7}) Name: audacity-freeworld Version: 2.2.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Multitrack audio editor Group: Applications/Multimedia License: GPLv2 @@ -88,14 +82,8 @@ BuildRequires: lame-devel BuildRequires: libmad-devel %endif %if %{with ffmpeg} -%if ! %{with local_ffmpeg} -%if %{with compat_ffmpeg} -BuildRequires: compat-ffmpeg28-devel -%else BuildRequires: ffmpeg-devel %endif -%endif -%endif # For new symbols in portaudio Requires: portaudio%{?_isa} >= 19-16 @@ -143,10 +131,6 @@ done export WX_CONFIG=wx-config-3.0-gtk2 %endif -%if %{with ffmpeg} && %{with compat_ffmpeg} -export PKG_CONFIG_PATH=%{_libdir}/compat-ffmpeg28/pkgconfig -%endif - aclocal -I m4 autoconf @@ -254,6 +238,9 @@ rm %{buildroot}%{_datadir}/doc/%{realname}/LICENSE.txt %changelog +* Fri Apr 27 2018 Leigh Scott <leigh123linux(a)googlemail.com&gt; - 2.2.2-5 +- Revert 'Use compat-ffmpeg28 on Fedora 28+' + * Thu Mar 08 2018 RPM Fusion Release Engineering <leigh123linux(a)googlemail.com&gt; - 2.2.2-4 - Rebuilt for new ffmpeg snapshot