rpms/audacity-freeworld/F-14 audacity-1.3.13-desktop.in.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 audacity-freeworld.spec, 1.19, 1.20 sources, 1.7, 1.8 audacity-1.3.10-desktop.patch, 1.1, NONE audacity-1.3.12-ffmpeg-0.6-apichange-av_match_ext.patch, 1.1, NONE audacity-1.3.12-ffmpeg-fix-ufile_write.patch, 1.1, NONE audacity-1.3.12-fix-minimum-playspeed.patch, 1.1, NONE audacity-1.3.12-portmixer-autoreconf.patch, 1.1, NONE audacity.desktop, 1.3, NONE audacity.png, 1.1, NONE

[David Timms]

Author: dtimms

Update of /cvs/free/rpms/audacity-freeworld/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv15819

Modified Files:
	.cvsignore audacity-freeworld.spec sources 
Added Files:
	audacity-1.3.13-desktop.in.patch 
Removed Files:
	audacity-1.3.10-desktop.patch 
	audacity-1.3.12-ffmpeg-0.6-apichange-av_match_ext.patch 
	audacity-1.3.12-ffmpeg-fix-ufile_write.patch 
	audacity-1.3.12-fix-minimum-playspeed.patch 
	audacity-1.3.12-portmixer-autoreconf.patch audacity.desktop 
	audacity.png 
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.


audacity-1.3.13-desktop.in.patch:
 audacity.desktop.in |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

--- NEW FILE audacity-1.3.13-desktop.in.patch ---
--- src/audacity.desktop.in.orig	2011-04-07 09:35:51.000000000 +1000
+++ src/audacity.desktop.in	2011-04-24 23:03:04.226793699 +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@
-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;


Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/audacity-freeworld/F-14/.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 22:18:26 -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/F-14/audacity-freeworld.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- audacity-freeworld.spec	10 Nov 2010 11:52:16 -0000	1.19
+++ audacity-freeworld.spec	26 Apr 2011 22:18:27 -0000	1.20
@@ -1,7 +1,7 @@
 Name: audacity-freeworld
 
-Version: 1.3.12
-Release: 0.11.beta%{?dist}
+Version: 1.3.13
+Release: 0.2.beta%{?dist}
 Summary: Multitrack audio editor
 Group:   Applications/Multimedia
 License: GPLv2
@@ -12,8 +12,6 @@
 Conflicts: %{realname}
 
 Source0: http://downloads.sf.net/sourceforge/audacity/audacity-minsrc-%{version}-beta.tar.bz2
-Source1: audacity.png
-Source2: audacity.desktop
 
 Patch1: audacity-1.3.7-libmp3lame-default.patch
 Patch2: audacity-1.3.9-libdir.patch
@@ -21,12 +19,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
-Patch7: audacity-1.3.12-fix-minimum-playspeed.patch
-Patch8: audacity-1.3.12-portmixer-autoreconf.patch
-Patch9: audacity-1.3.12-ffmpeg-fix-ufile_write.patch
+Patch3: audacity-1.3.13-desktop.in.patch
 
 Provides: audacity-nonfree = %{version}-%{release}
 Obsoletes: audacity-nonfree < %{version}-%{release}
@@ -72,8 +65,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
@@ -81,20 +74,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
-
-%patch7 -p1 -b .fix-minimum-playspeed
-%patch8 -p1 -b .portmixer-autoreconf-from-svn
-%patch9 -p1 -b .ffmpeg-from-svn
-
-
 # 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 \
@@ -117,9 +104,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
@@ -130,8 +114,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
 
 
@@ -164,6 +148,14 @@
 
 
 %changelog
+* Tue Apr 26 2011 David Timms <iinet.net.au at dtimms> - 1.3.13-0.2.beta
+- delete help file Source reference; will be done in Fedora instead.
+
+* Sun Apr 24 2011 David Timms <iinet.net.au at dtimms> - 1.3.13-0.2.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 at dtimms> - 1.3.12-0.11.beta
 - fix build failure compiling ffmpeg.cpp
 


Index: sources
===================================================================
RCS file: /cvs/free/rpms/audacity-freeworld/F-14/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 22:18:28 -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-1.3.12-ffmpeg-fix-ufile_write.patch DELETED ---


--- audacity-1.3.12-fix-minimum-playspeed.patch DELETED ---


--- audacity-1.3.12-portmixer-autoreconf.patch DELETED ---


--- audacity.desktop DELETED ---