From b9de9aa6d30674128d1684bc7f355ef8a0233c1e Mon Sep 17 00:00:00 2001 From: David Timms Date: Mar 05 2015 20:57:01 +0000 Subject: Update to 2.1.0 release candidate 2 for testing. --- diff --git a/audacity.spec b/audacity.spec index f62422e..54c810c 100644 --- a/audacity.spec +++ b/audacity.spec @@ -3,8 +3,8 @@ Name: audacity -Version: 2.0.6 -Release: 1%{?dist} +Version: 2.1.0 +Release: 0.1.rc2%{?dist} Summary: Multitrack audio editor Group: Applications/Multimedia License: GPLv2 @@ -13,11 +13,12 @@ URL: http://audacity.sourceforge.net %define realname audacity # use for upstream source releases: -#Source0: http://downloads.sf.net/sourceforge/audacity/audacity-minsrc-%#{version}-beta.tar.bz2 -Source0: http://audacity.googlecode.com/files/audacity-minsrc-%{version}.tar.xz -%define tartopdir audacity-src-%{version} +Source0: http://downloads.sf.net/sourceforge/audacity/audacity-minsrc-%{version}rc2.tar.xz +#Source0: http://audacity.googlecode.com/files/audacity-minsrc-%{version}.tar.xz +%define tartopdir audacity-minsrc-%{version} -Source1: http://audacity.googlecode.com/files/audacity-manual-%{version}.zip +Source1: http://audacity.googlecode.com/files/audacity-manual-%{version}rc2.zip +#Source1: http://audacity.googlecode.com/files/audacity-manual-%{version}.zip # Patch1: audacity-2.0.4-libmp3lame-default.patch # Patch2: audacity-1.3.9-libdir.patch @@ -75,7 +76,7 @@ For the most up to date manual content, use the on-line manual. # Substitute hardcoded library paths. # %patch1 -b .libmp3lame-default # %patch2 -p1 -b .libdir -for i in src/effects/ladspa/LoadLadspa.cpp src/AudacityApp.cpp src/export/ExportMP3.cpp +for i in src/AudacityApp.cpp src/export/ExportMP3.cpp do sed -i -e 's!__RPM_LIBDIR__!%{_libdir}!g' $i sed -i -e 's!__RPM_LIB__!%{_lib}!g' $i @@ -128,6 +129,7 @@ make %install %make_install +rm -Rf $RPM_BUILD_ROOT%{_datadir}/%{realname}/include # Audacity 1.3.8-beta complains if the help/manual directories # don't exist. @@ -143,6 +145,8 @@ desktop-file-install --dir $RPM_BUILD_ROOT%{_datadir}/applications \ # audacity manual must be unzipped to correct location unzip %{SOURCE1} -d $RPM_BUILD_ROOT%{_datadir}/%{realname} +# remove __MACOSX subfolder contents. +rm -Rf $RPM_BUILD_ROOT%{_datadir}/%{realname}/__MACOSX %post @@ -184,6 +188,10 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %changelog + +* Thu Mar 05 2015 David Timms - 2.1.0-0.1.rc2 +- Update to release candidate 2 for testing. + * Mon Sep 29 2014 Richard Hughes - 2.0.6-1 - Update to new upstream release