diff --git a/.gitignore b/.gitignore index 18617fe..0e8aea3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -/audacity-minsrc-2.3.1.tar.xz -/audacity-manual-2.3.1.zip +/audacity-minsrc-2.3.2.tar.xz +/audacity-manual-2.3.2.zip diff --git a/audacity-2.2.1-libdir.patch b/audacity-2.2.1-libdir.patch deleted file mode 100644 index 0831862..0000000 --- a/audacity-2.2.1-libdir.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ./src/effects/ladspa/LadspaEffect.cpp.orig 2018-02-25 02:49:21.270199818 +0000 -+++ ./src/effects/ladspa/LadspaEffect.cpp 2018-02-25 02:54:23.311154018 +0000 -@@ -315,7 +315,7 @@ wxArrayString LadspaEffectsModule::GetSe - #else - - pathList.Add(wxGetHomeDir() + wxFILE_SEP_PATH + wxT(".ladspa")); -- pathList.Add(wxT("/usr/local/lib/ladspa")); -+ pathList.Add(wxT("/usr/%{_lib}/ladspa")); - pathList.Add(wxT("/usr/lib/ladspa")); - pathList.Add(wxT(LIBDIR) wxT("/ladspa")); - diff --git a/audacity-2.3.2-libdir.patch b/audacity-2.3.2-libdir.patch new file mode 100644 index 0000000..f286119 --- /dev/null +++ b/audacity-2.3.2-libdir.patch @@ -0,0 +1,11 @@ +--- ./src/effects/ladspa/LadspaEffect.cpp 2019-05-05 21:08:56.000000000 +1000 ++++ ./src/effects/ladspa/LadspaEffect.cpp.orig 2019-06-03 21:45:30.059886205 +1000 +@@ -358,7 +358,7 @@ + #else + + pathList.push_back(wxGetHomeDir() + wxFILE_SEP_PATH + wxT(".ladspa")); +- pathList.push_back(wxT("/usr/local/lib/ladspa")); ++ pathList.push_back(wxT("/usr/%{_lib}/ladspa")); + pathList.push_back(wxT("/usr/lib/ladspa")); + pathList.push_back(wxT(LIBDIR) wxT("/ladspa")); + diff --git a/audacity.spec b/audacity.spec index d7787ea..134e7ef 100644 --- a/audacity.spec +++ b/audacity.spec @@ -14,7 +14,7 @@ Name: audacity -Version: 2.3.1 +Version: 2.3.2 Release: 1%{?dist} Summary: Multitrack audio editor License: GPLv2 @@ -33,7 +33,7 @@ Source0: http://www.fosshub.com/Audacity.html/%{name}-minsrc-%{version}.tar.xz Source1: http://www.fosshub.com/Audacity.html/%{name}-manual-%{version}.zip Patch1: audacity-2.2.1-libmp3lame-default.patch -Patch2: audacity-2.2.1-libdir.patch +Patch2: audacity-2.3.2-libdir.patch # add audio/x-flac # remove audio/mpeg, audio/x-mp3 # enable startup notification @@ -43,8 +43,13 @@ Patch3: audacity-2.0.2-desktop.in.patch BuildRequires: automake BuildRequires: autoconf BuildRequires: gettext-devel + +%if 0%{?rhel} == 7 +BuildRequires: devtoolset-7-toolchain, devtoolset-7-libatomic-de +%endif BuildRequires: gcc BuildRequires: gcc-c++ + BuildRequires: libtool BuildRequires: alsa-lib-devel BuildRequires: desktop-file-utils @@ -138,6 +143,10 @@ export WX_CONFIG=wx-config-3.0-gtk2 export PKG_CONFIG_PATH=%{_libdir}/compat-ffmpeg28/pkgconfig %endif +%if 0%{?rhel} +. /opt/rh/devtoolset-7/enable +%endif + aclocal -I m4 autoconf @@ -211,7 +220,7 @@ fi mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/help/manual # audacity manual must be unzipped to correct location -unzip %{SOURCE1} -d $RPM_BUILD_ROOT%{_datadir}/%{realname}/help/manual +unzip %{SOURCE1} -d $RPM_BUILD_ROOT%{_datadir}/%{realname} %{find_lang} %{realname} @@ -247,6 +256,11 @@ rm %{buildroot}%{_datadir}/doc/%{realname}/LICENSE.txt %changelog +* Tue Jun 4 2019 David Timms - 2.3.2-1 +- Update to Audacity 2.3.2 release. +- Rebase audacity-2.3.2-libdir.patch. +- Fix -manual placing files in extra help/manual path. + * Fri Apr 19 2019 David Timms - 2.3.1-1 - Update to Audacity 2.3.1 release. diff --git a/sources b/sources index 502d537..8f1053d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (audacity-minsrc-2.3.1.tar.xz) = 78882554bcee99bcf87d3bb6b3adf6ceb93b12a336d5b2436065e9684bb530f0aad7023dd3f5c5d77438984e42e9b4c4259690a79a8ff3627d31b90b00639314 -SHA512 (audacity-manual-2.3.1.zip) = 0e3a57a81b3c300d9db3544294967ceadc8f5dd962d149790926418722dec44fb958b445d49e12387eba85f7c3b83ef8455b23d6735609b3531e8b520d01834f +SHA512 (audacity-minsrc-2.3.2.tar.xz) = 480b01d5a8731ad7df39ce67d6a4f5c992db2e0f4b8c4566e8fcc10fb4e4f90e113962512b989fcd3b9eddc1513bbb46714bc698b19c7e13c5b401de10f8e7e8 +SHA512 (audacity-manual-2.3.2.zip) = 5e541065236badfdc2331681e43dee2564f933c33a3a588806f189acc8d8285a2c60bf9bc0c7052c6cb23fa1ee29a9f5e0428540cd556901dcf896def1c7c0ac