diff --git a/audacity-1.3.4-libdir.patch b/audacity-1.3.4-libdir.patch deleted file mode 100644 index f86cac3..0000000 --- a/audacity-1.3.4-libdir.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -Nur audacity-src-1.3.4-beta-orig/src/effects/ladspa/LoadLadspa.cpp audacity-src-1.3.4-beta/src/effects/ladspa/LoadLadspa.cpp ---- audacity-src-1.3.4-beta-orig/src/effects/ladspa/LoadLadspa.cpp 2008-01-23 18:32:52.000000000 +0100 -+++ audacity-src-1.3.4-beta/src/effects/ladspa/LoadLadspa.cpp 2008-03-21 23:21:45.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__ -diff -Nur audacity-src-1.3.5-beta-orig/lib-src/libvamp/vamp-sdk/PluginHostAdapter.cpp audacity-src-1.3.5-beta/lib-src/libvamp/vamp-sdk/PluginHostAdapter.cpp ---- audacity-src-1.3.5-beta-orig/lib-src/libvamp/vamp-sdk/PluginHostAdapter.cpp 2008-05-07 23:19:58.000000000 +0200 -+++ audacity-src-1.3.5-beta/lib-src/libvamp/vamp-sdk/PluginHostAdapter.cpp 2008-05-11 20:56:59.000000000 +0200 -@@ -75,7 +75,7 @@ - #ifdef __APPLE__ - #define DEFAULT_VAMP_PATH "$HOME/Library/Audio/Plug-Ins/Vamp:/Library/Audio/Plug-Ins/Vamp" - #else --#define DEFAULT_VAMP_PATH "$HOME/vamp:$HOME/.vamp:/usr/local/lib/vamp:/usr/lib/vamp" -+#define DEFAULT_VAMP_PATH "$HOME/vamp:$HOME/.vamp:/usr/local/__RPM_LIB__/vamp:__RPM_LIBDIR__/vamp" - #endif - #endif - diff --git a/audacity-1.3.5-libdir.patch b/audacity-1.3.5-libdir.patch new file mode 100644 index 0000000..a49e963 --- /dev/null +++ b/audacity-1.3.5-libdir.patch @@ -0,0 +1,14 @@ +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__ diff --git a/audacity.spec b/audacity.spec index 17149e9..e74bc6d 100644 --- a/audacity.spec +++ b/audacity.spec @@ -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 @@ Source1: audacity.png 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: libsamplerate-devel 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 @@ Linux/*BSD, MacOS, and Windows. # 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 @@ update-desktop-database &> /dev/null || : %changelog +* Tue Nov 4 2008 Michael Schwendt - 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 - 1.3.5-0.6.beta +- rediff some patches for Fedora fuzz=0 pedantry + * Sun Jun 8 2008 Michael Schwendt - 1.3.5-0.5.beta - fix bad fr.po that makes Fichier>Open dialog too wide