rpms/audacity-freeworld/F-18 audacity-2.0.4-libmp3lame-default.patch, NONE, 1.1 .cvsignore, 1.15, 1.16 audacity-freeworld.spec, 1.26, 1.27 sources, 1.15, 1.16 audacity-2.0.1-libmp3lame-default.patch, 1.1, NONE

[David Timms]

Author: dtimms

Update of /cvs/free/rpms/audacity-freeworld/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv24462

Modified Files:
	.cvsignore audacity-freeworld.spec sources 
Added Files:
	audacity-2.0.4-libmp3lame-default.patch 
Removed Files:
	audacity-2.0.1-libmp3lame-default.patch 
Log Message:
- update to upstream release 2.0.4
- rebase audacity-2.0.1-libmp3lame-default


audacity-2.0.4-libmp3lame-default.patch:
 AudacityApp.cpp |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE audacity-2.0.4-libmp3lame-default.patch ---
--- src/AudacityApp.cpp.orig	2013-09-14 23:10:02.523311571 +1000
+++ src/AudacityApp.cpp	2013-09-14 23:11:38.641360961 +1000
@@ -1182,6 +1182,8 @@
       return false;
    }
 
+   gPrefs->Write(wxT("/MP3/MP3LibPath"),wxT("__RPM_LIBDIR__/libmp3lame.so.0"));
+
    // More initialization
 
    InitDitherers();


Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/audacity-freeworld/F-18/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	14 May 2013 07:55:13 -0000	1.15
+++ .cvsignore	14 Sep 2013 22:35:58 -0000	1.16
@@ -1 +1 @@
-audacity-minsrc-2.0.3.tar.xz
+audacity-minsrc-2.0.4.tar.xz


Index: audacity-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/audacity-freeworld/F-18/audacity-freeworld.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- audacity-freeworld.spec	14 May 2013 07:55:14 -0000	1.26
+++ audacity-freeworld.spec	14 Sep 2013 22:35:58 -0000	1.27
@@ -1,6 +1,6 @@
 Name: audacity-freeworld
 
-Version: 2.0.3
+Version: 2.0.4
 Release: 1%{?dist}
 Summary: Multitrack audio editor
 Group:   Applications/Multimedia
@@ -15,7 +15,7 @@
 Source0: http://audacity.googlecode.com/files/audacity-minsrc-%{version}.tar.xz
 %define tartopdir audacity-src-%{version}
 
-Patch1: audacity-2.0.1-libmp3lame-default.patch
+Patch1: audacity-2.0.4-libmp3lame-default.patch
 Patch2: audacity-1.3.9-libdir.patch
 # add audio/x-flac
 # remove audio/mpeg, audio/x-mp3
@@ -66,7 +66,7 @@
 %setup -q -n %{tartopdir}
 
 # Substitute hardcoded library paths.
-%patch1 -p1 -b .libmp3lame-default
+%patch1 -b .libmp3lame-default
 %patch2 -p1 -b .libdir
 for i in src/effects/ladspa/LoadLadspa.cpp src/AudacityApp.cpp src/export/ExportMP3.cpp
 do
@@ -172,6 +172,10 @@
 
 
 %changelog
+* Sat Sep 14 2013 David Timms <iinet.net.au at dtimms> - 2.0.4-1
+- update to upstream release 2.0.4
+- rebase audacity-2.0.1-libmp3lame-default
+
 * Sat May  4 2013 Hans de Goede <j.w.r.degoede at gmail.com> - 2.0.3-1
 - New upstream release 2.0.3
 - Fix FTBFS by using ffmpeg-compat (rf#2707)


Index: sources
===================================================================
RCS file: /cvs/free/rpms/audacity-freeworld/F-18/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	14 May 2013 07:55:14 -0000	1.15
+++ sources	14 Sep 2013 22:35:58 -0000	1.16
@@ -1 +1 @@
-648cce8a9ce86eebfc53921172ee9d89  audacity-minsrc-2.0.3.tar.xz
+739e4e12a8a4f30e305f04493099ff5b  audacity-minsrc-2.0.4.tar.xz


--- audacity-2.0.1-libmp3lame-default.patch DELETED ---