Author: dtimms Update of /cvs/free/rpms/audacity-freeworld/F-17 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv26769 Modified Files: .cvsignore audacity-freeworld.spec sources Added Files: audacity-2.0.1-desktop.in.patch audacity-2.0.1-libmp3lame-default.patch Removed Files: audacity-1.3.13-desktop.in.patch audacity-1.3.7-libmp3lame-default.patch Log Message: update to 2.0.2 release candidate 2 rebase libmp3lame-default.patch rebase desktop.in.patch audacity-2.0.1-desktop.in.patch: audacity.desktop.in | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) --- NEW FILE audacity-2.0.1-desktop.in.patch --- --- audacity-src-2.0.1/src/audacity.desktop.in 2012-06-26 07:27:46.000000000 +1000 +++ audacity-src-2.0.0/src/audacity.desktop.in 2012-07-04 22:11:31.000000000 +1000 @@ -5,16 +5,17 @@ GenericName=Sound Editor GenericName[de]=Audio-Editor GenericName[ru]=Редактор звуковых файлов -Comment=Record and edit audio files +Comment=Record and edit audio files with multitrack capability Comment[de]=Audio-Dateien aufnehmen und bearbeiten Comment[ru]=Запись и редактирование звуковых файлов Icon=@AUDACITY_NAME@ Type=Application -Categories=AudioVideo;Audio;AudioVideoEditing; +Categories=AudioVideo;Audio;GTK;GNOME;Sequencer;X-Jack;AudioVideoEditing; Exec=@AUDACITY_NAME@ %F -StartupNotify=false +StartupNotify=true +StartupWMClass=Audacity Terminal=false -MimeType=application/ogg;audio/basic;audio/mpeg;audio/x-aiff;audio/x-mp3;audio/x-wav;application/x-audacity-project; +MimeType=application/ogg;audio/basic;audio/mpeg;audio/x-aiff;audio/x-aiffc;audio/x-aifc;audio/x-mp3;audio/x-wav;application/x-audacity-project;audio/midi;audio/x-flac; audacity-2.0.1-libmp3lame-default.patch: AudacityApp.cpp | 2 ++ 1 file changed, 2 insertions(+) --- NEW FILE audacity-2.0.1-libmp3lame-default.patch --- diff -Nur audacity-src-2.0.0/src/AudacityApp.cpp audacity-src-2.0.1/src/AudacityApp.cpp --- audacity-src-2.0.0/src/AudacityApp.cpp 2012-07-03 20:49:56.494204862 +1000 +++ audacity-src-2.0.1/src/AudacityApp.cpp 2012-07-03 20:46:51.994199900 +1000 @@ -1172,6 +1172,8 @@ return false; } + gPrefs->Write(wxT("/MP3/MP3LibPath"), wxT("__RPM_LIBDIR__/libmp3lame.so.0")); + // More initialization #ifdef CLEANSPEECH InitCleanSpeech(); Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/audacity-freeworld/F-17/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 14 Mar 2012 22:54:24 -0000 1.13 +++ .cvsignore 13 Aug 2012 09:25:16 -0000 1.14 @@ -1 +1 @@ -audacity-minsrc-2.0.0.tar.bz2 +audacity-minsrc-2.0.2rc2.tar.bz2 Index: audacity-freeworld.spec =================================================================== RCS file: /cvs/free/rpms/audacity-freeworld/F-17/audacity-freeworld.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- audacity-freeworld.spec 14 Mar 2012 22:54:24 -0000 1.25 +++ audacity-freeworld.spec 13 Aug 2012 09:25:16 -0000 1.26 @@ -3,8 +3,8 @@ Name: audacity-freeworld -Version: 2.0.0 -Release: 1%{?dist} +Version: 2.0.2 +Release: 0.1.rc2%{?dist} Summary: Multitrack audio editor Group: Applications/Multimedia License: GPLv2 @@ -15,16 +15,16 @@ # use for upstream source releases: #Source0: http://downloads.sf.net/sourceforge/audacity/audacity-minsrc-%#{version}-... -Source0: http://audacity.googlecode.com/files/audacity-minsrc-%{version}.tar.bz2 +Source0: http://audacity.googlecode.com/files/audacity-minsrc-%{version}rc2.tar.bz2 %define tartopdir audacity-src-%{version} -Patch1: audacity-1.3.7-libmp3lame-default.patch +Patch1: audacity-2.0.1-libmp3lame-default.patch Patch2: audacity-1.3.9-libdir.patch # add audio/x-flac # remove audio/mpeg, audio/x-mp3 # enable startup notification # add categories Sequencer X-Jack AudioVideoEditing for F-12 Studio feature -Patch3: audacity-1.3.13-desktop.in.patch +Patch3: audacity-2.0.1-desktop.in.patch Provides: audacity-nonfree = %{version}-%{release} Obsoletes: audacity-nonfree < %{version}-%{release} @@ -85,7 +85,7 @@ sed -i -e 's!libmp3lame.so\([^.]\)!libmp3lame.so.0\1!g' $i done -%patch3 -b .desktop.old +%patch3 -p1 -b .desktop.old %build @@ -156,6 +156,17 @@ %changelog +* Mon Aug 13 2012 David Timms <iinet.net.au@dtimms> - 2.0.2-0.1.rc2 +- update to 2.0.2 release candidate 2 + +* Tue Jul 3 2012 David Timms <iinet.net.au@dtimms> - 2.0.1-1 +- update to 2.0.1 final +- rebase libmp3lame-default.patch +- rebase desktop.in.patch + +* Wed Jun 26 2012 David Timms <iinet.net.au@dtimms> - 2.0.1-0.1.rc2 +- update to 2.0.1 release candidate 2 + * Wed Mar 14 2012 David Timms <iinet.net.au@dtimms> - 2.0.0-1 - update to 2.0.0 final Index: sources =================================================================== RCS file: /cvs/free/rpms/audacity-freeworld/F-17/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 14 Mar 2012 22:54:25 -0000 1.13 +++ sources 13 Aug 2012 09:25:16 -0000 1.14 @@ -1 +1 @@ -094b7001af29818cd84961b83397377f audacity-minsrc-2.0.0.tar.bz2 +469f7d5e938eea2ca4f57f9a739ae0ac audacity-minsrc-2.0.2rc2.tar.bz2 --- audacity-1.3.13-desktop.in.patch DELETED --- --- audacity-1.3.7-libmp3lame-default.patch DELETED ---