Author: dtimms Update of /cvs/free/rpms/audacity-freeworld/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv3205 Modified Files: .cvsignore audacity-freeworld.spec sources Removed Files: audacity-1.3.10-desktop.patch audacity-1.3.12-ffmpeg-0.6-apichange-av_match_ext.patch audacity.desktop Log Message: upgrade to 1.3.13-beta drop patches included in upstream release convert desktop file to a patch against new upstream .desktop file. Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/audacity-freeworld/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 27 Jun 2010 14:41:58 -0000 1.7 +++ .cvsignore 26 Apr 2011 13:20:05 -0000 1.8 @@ -1 +1 @@ -audacity-minsrc-1.3.12-beta.tar.bz2 +audacity-minsrc-1.3.13-beta.tar.bz2 Index: audacity-freeworld.spec =================================================================== RCS file: /cvs/free/rpms/audacity-freeworld/devel/audacity-freeworld.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- audacity-freeworld.spec 8 Aug 2010 22:00:23 -0000 1.15 +++ audacity-freeworld.spec 26 Apr 2011 13:20:06 -0000 1.16 @@ -1,7 +1,7 @@ Name: audacity-freeworld -Version: 1.3.12 -Release: 0.7.beta%{?dist} +Version: 1.3.13 +Release: 0.1.beta%{?dist} Summary: Multitrack audio editor Group: Applications/Multimedia License: GPLv2 @@ -12,8 +12,7 @@ Conflicts: %{realname} Source0: http://downloads.sf.net/sourceforge/audacity/audacity-minsrc-%{version}-b... -Source1: audacity.png -Source2: audacity.desktop +Source1: http://manual.audacityteam.org/help.zip Patch1: audacity-1.3.7-libmp3lame-default.patch Patch2: audacity-1.3.9-libdir.patch @@ -21,9 +20,7 @@ # remove audio/mpeg, audio/x-mp3 # enable startup notification # add categories Sequencer X-Jack AudioVideoEditing for F-12 Studio feature -Patch3: audacity-1.3.10-desktop.patch -# ffmpeg-0.6: utils.c changed match_ext() to av_match_ext(). -Patch4: audacity-1.3.12-ffmpeg-0.6-apichange-av_match_ext.patch +Patch3: audacity-1.3.13-desktop.in.patch Provides: audacity-nonfree = %{version}-%{release} Obsoletes: audacity-nonfree < %{version}-%{release} @@ -69,8 +66,8 @@ %setup -q -n %{tartopdir} # Substitute hardcoded library paths. -%patch1 -p1 -%patch2 -p1 +%patch1 -p1 -b .libmp3lame-default +%patch2 -p1 -b .libdir for i in src/effects/ladspa/LoadLadspa.cpp src/AudacityApp.cpp src/export/ExportMP3.cpp do sed -i -e 's!__RPM_LIBDIR__!%{_libdir}!g' $i @@ -78,15 +75,14 @@ done grep -q -s __RPM_LIB * -R && exit 1 -%patch3 -p1 -b .old-desktop-file -%patch4 -p1 -b .ffmpeg-0.6-apichange-av_match_ext - # Substitute occurences of "libmp3lame.so" with "libmp3lame.so.0". for i in locale/*.po src/export/ExportMP3.cpp do sed -i -e 's!libmp3lame.so\([^.]\)!libmp3lame.so.0\1!g' $i done +%patch3 -b .desktop.old + %build %configure \ @@ -109,9 +105,6 @@ %install rm -rf ${RPM_BUILD_ROOT} -mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps -cp %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/pixmaps - make DESTDIR=${RPM_BUILD_ROOT} install # Audacity 1.3.8-beta complains if the help/manual directories @@ -122,8 +115,8 @@ desktop-file-install \ --vendor fedora \ - --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --delete-original \ + --dir $RPM_BUILD_ROOT%{_datadir}/applications \ $RPM_BUILD_ROOT%{_datadir}/applications/audacity.desktop @@ -156,6 +149,25 @@ %changelog +* Sun Apr 24 2011 David Timms <iinet.net.au@dtimms> - 1.3.13-0.1.beta +- upgrade to 1.3.13-beta +- drop patches included in upstream release +- convert desktop file to a patch against new upstream .desktop file. + +* Wed Nov 10 2010 David Timms <iinet.net.au@dtimms> - 1.3.12-0.11.beta +- fix build failure compiling ffmpeg.cpp + +* Wed Nov 10 2010 David Timms <iinet.net.au@dtimms> - 1.3.12-0.10.beta +- fix build failure in portmixer due to "Missing support in pa_mac_core.h" + Applied svn trunk portmixer configure changes. +- del previous patch attempt (unsuccessful) + +* Mon Oct 31 2010 David Timms <iinet.net.au@dtimms> - 1.3.12-0.9.beta +- fix build failure due to portmixer configure problems + +* Mon Oct 31 2010 David Timms <iinet.net.au@dtimms> - 1.3.12-0.8.beta +- fix hang when play at speed with ratio less than 0.09 is used (#637347) + * Sat Aug 7 2010 David Timms <iinet.net.au@dtimms> - 1.3.12-0.7.beta - patch to suit APIChange introduced in ffmpeg-0.6. Resolves rfbz #1356. fixes ffmpeg import/export. Index: sources =================================================================== RCS file: /cvs/free/rpms/audacity-freeworld/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 27 Jun 2010 14:41:58 -0000 1.7 +++ sources 26 Apr 2011 13:20:06 -0000 1.8 @@ -1 +1 @@ -76996fec67181ca82ba191e012518b57 audacity-minsrc-1.3.12-beta.tar.bz2 +57be7fadb8c8dd17b8462c7ac1561d03 audacity-minsrc-1.3.13-beta.tar.bz2 --- audacity-1.3.10-desktop.patch DELETED --- --- audacity-1.3.12-ffmpeg-0.6-apichange-av_match_ext.patch DELETED --- --- audacity.desktop DELETED ---