rpms/audacity/F-9 audacity-1.3.5-libdir.patch, NONE, 1.1 audacity.spec, 1.52, 1.53 audacity-1.3.4-libdir.patch, 1.2, NONE

[Michael Schwendt]

Author: mschwendt

Update of /cvs/pkgs/rpms/audacity/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13999/F-9

Modified Files:
	audacity.spec 
Added Files:
	audacity-1.3.5-libdir.patch 
Removed Files:
	audacity-1.3.4-libdir.patch 
Log Message:
sync with Rawhide

audacity-1.3.5-libdir.patch:

--- NEW FILE audacity-1.3.5-libdir.patch ---
diff -Nur audacity-src-1.3.5-beta-orig/src/effects/ladspa/LoadLadspa.cpp audacity-src-1.3.5-beta/src/effects/ladspa/LoadLadspa.cpp
--- audacity-src-1.3.5-beta-orig/src/effects/ladspa/LoadLadspa.cpp	2008-05-07 23:19:50.000000000 +0200
+++ audacity-src-1.3.5-beta/src/effects/ladspa/LoadLadspa.cpp	2008-11-04 14:21:26.000000000 +0100
@@ -92,8 +92,8 @@
 
    #ifdef __WXGTK__
    wxGetApp().AddUniquePathToPathList(wxT(INSTALL_PREFIX) wxT("/ladspa"), pathList);
-   wxGetApp().AddUniquePathToPathList(wxT("/usr/local/lib/ladspa"), pathList);
-   wxGetApp().AddUniquePathToPathList(wxT("/usr/lib/ladspa"), pathList);
+   wxGetApp().AddUniquePathToPathList(wxT("/usr/local/__RPM_LIB__/ladspa"), pathList);
+   wxGetApp().AddUniquePathToPathList(wxT("__RPM_LIBDIR__/ladspa"), pathList);
    #endif
 
    #ifdef __WXMAC__


Index: audacity.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacity/F-9/audacity.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- audacity.spec	24 Oct 2008 17:48:07 -0000	1.52
+++ audacity.spec	4 Nov 2008 13:32:32 -0000	1.53
@@ -5,7 +5,7 @@
 
 Name: audacity
 Version: 1.3.5
-Release: 0.5.beta%{?dist}
+Release: 0.7.beta%{?dist}
 Summary: Multitrack audio editor
 Group: Applications/Multimedia
 License: GPLv2
@@ -16,7 +16,7 @@
 Source2: audacity.desktop
 
 Patch1: audacity-1.3.4-libmp3lame-default.patch
-Patch2: audacity-1.3.4-libdir.patch
+Patch2: audacity-1.3.5-libdir.patch
 Patch3: audacity-1.3.5-fr.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -33,6 +33,7 @@
 BuildRequires: libsndfile-devel
 BuildRequires: libvorbis-devel
 BuildRequires: soundtouch-devel
+BuildRequires: vamp-plugin-sdk-devel
 BuildRequires: zip
 BuildRequires: zlib-devel
 BuildRequires: wxGTK2-devel
@@ -53,7 +54,7 @@
 # Substitute hardcoded library paths.
 %patch1 -p1
 %patch2 -p1
-for i in src/effects/ladspa/LoadLadspa.cpp src/export/ExportMP3.cpp src/AudacityApp.cpp lib-src/libvamp/vamp-sdk/PluginHostAdapter.cpp
+for i in src/effects/ladspa/LoadLadspa.cpp src/export/ExportMP3.cpp src/AudacityApp.cpp
 do
     sed -i -e 's!__RPM_LIBDIR__!%{_libdir}!g' $i
     sed -i -e 's!__RPM_LIB__!%{_lib}!g' $i
@@ -131,6 +132,13 @@
 
 
 %changelog
+* Tue Nov  4 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 1.3.5-0.7.beta
+- BR vamp-plugin-sdk-devel
+- no longer build with included Vamp API, also drop Vamp multilib patch
+
+* Thu Aug 28 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 1.3.5-0.6.beta
+- rediff some patches for Fedora fuzz=0 pedantry
+
 * Sun Jun  8 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 1.3.5-0.5.beta
 - fix bad fr.po that makes Fichier>Open dialog too wide
 


--- audacity-1.3.4-libdir.patch DELETED ---