From 3a1f7ff46216eac390bdda59ce4db690fc8b4ff7 Mon Sep 17 00:00:00 2001 From: Michael Schwendt Date: Feb 10 2008 21:26:07 +0000 Subject: testing only --- diff --git a/audacity-1.3.2-libdir.patch b/audacity-1.3.2-libdir.patch new file mode 100644 index 0000000..428b74d --- /dev/null +++ b/audacity-1.3.2-libdir.patch @@ -0,0 +1,26 @@ +diff -Nur audacity-src-1.3.2-beta-orig/src/effects/ladspa/LoadLadspa.cpp audacity-src-1.3.2-beta/src/effects/ladspa/LoadLadspa.cpp +--- audacity-src-1.3.2-beta-orig/src/effects/ladspa/LoadLadspa.cpp 2006-10-29 01:05:27.000000000 +0200 ++++ audacity-src-1.3.2-beta/src/effects/ladspa/LoadLadspa.cpp 2008-02-10 22:00:53.000000000 +0100 +@@ -86,8 +86,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.2-beta-orig/src/export/ExportMP3.cpp audacity-src-1.3.2-beta/src/export/ExportMP3.cpp +--- audacity-src-1.3.2-beta-orig/src/export/ExportMP3.cpp 2006-10-29 01:05:27.000000000 +0200 ++++ audacity-src-1.3.2-beta/src/export/ExportMP3.cpp 2008-02-10 21:58:51.000000000 +0100 +@@ -258,7 +258,7 @@ + + wxString GetLibraryPath() + { +- return wxT("/usr/lib"); ++ return wxT("__RPM_LIBDIR__"); + } + + wxString GetLibraryName() diff --git a/audacity-1.3.2-testing.patch b/audacity-1.3.2-testing.patch new file mode 100644 index 0000000..49e75ee --- /dev/null +++ b/audacity-1.3.2-testing.patch @@ -0,0 +1,11 @@ +diff -Nur audacity-src-1.3.2-beta-orig/src/effects/LoadEffects.cpp audacity-src-1.3.2-beta/src/effects/LoadEffects.cpp +--- audacity-src-1.3.2-beta-orig/src/effects/LoadEffects.cpp 2006-10-29 01:05:27.000000000 +0200 ++++ audacity-src-1.3.2-beta/src/effects/LoadEffects.cpp 2008-02-10 22:14:38.000000000 +0100 +@@ -132,6 +132,7 @@ + //#endif + + #ifdef USE_LADSPA ++#error Testing only! + LoadLadspaPlugins(); + #endif + diff --git a/audacity.spec b/audacity.spec index 21f9ffb..6c12768 100644 --- a/audacity.spec +++ b/audacity.spec @@ -1,6 +1,6 @@ Name: audacity Version: 1.3.2 -Release: 18%{?dist} +Release: 18%{?dist}.1 Summary: A multitrack audio editor Group: Applications/Multimedia @@ -18,6 +18,8 @@ Patch5: audacity-1.3.2-resample.patch Patch6: audacity-1.3.2-FLAC.patch Patch7: audacity-1.3.2-expat2.patch Patch8: audacity-1.3.2-gcc43.patch +Patch9: audacity-1.3.2-libdir.patch +Patch10: audacity-1.3.2-testing.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: alsa-lib-devel BuildRequires: desktop-file-utils @@ -62,16 +64,22 @@ Linux/*BSD, MacOS, and Windows. %patch7 -p1 -b .expat2 %patch8 -p1 -b .gcc43 -# Substitute occurences of "libmp3lame.so" with "libmp3lame.so.0". -for i in help/wxhelp/audacity.hhk help/wxhelp/exportmp3.htm locale/*.po src/export/ExportMP3.cpp +# Substitute hardcoded library paths. +%patch9 -p1 +for i in src/effects/ladspa/LoadLadspa.cpp src/export/ExportMP3.cpp do - sed -i -e 's!libmp3lame.so\([^.]\)!libmp3lame.so.0\1!g' $i + sed -i -e 's!__RPM_LIBDIR__!%{_libdir}!g' $i + sed -i -e 's!__RPM_LIB__!%{_lib}!g' $i done +grep -q -s __RPM_LIB * -R && exit 1 + +%patch10 -p1 -b .testing-only +grep LADSPA src/configunix.h -# Substitute hardcoded /usr/lib paths. -for i in src/AudacityApp.cpp src/export/ExportMP3.cpp +# Substitute occurences of "libmp3lame.so" with "libmp3lame.so.0". +for i in help/wxhelp/audacity.hhk help/wxhelp/exportmp3.htm locale/*.po src/export/ExportMP3.cpp do - sed -i -e 's!/usr/lib!%{_libdir}!g' $i + sed -i -e 's!libmp3lame.so\([^.]\)!libmp3lame.so.0\1!g' $i done %ifnarch %{ix86} x86_64 @@ -145,26 +153,30 @@ umask 022 %changelog -* Thu Jan 3 2008 Michael Schwendt - 1.3.2-18 +* Sun Feb 10 2008 Michael Schwendt +- add patch10 to test something +- subst _libdir in ladspa plugin loader + +* Thu Jan 3 2008 Michael Schwendt - 1.3.2-18 - Patch for GCC 4.3.0 C++. -* Fri Nov 16 2007 Michael Schwendt - 1.3.2-17 +* Fri Nov 16 2007 Michael Schwendt - 1.3.2-17 - rebuilt for FLAC 1.1.4 -> 1.2.x upgrade, which broke FLAC import -* Tue Aug 28 2007 Michael Schwendt - 1.3.2-16 +* Tue Aug 28 2007 Michael Schwendt - 1.3.2-16 - rebuilt for new expat (#195888) -* Tue Aug 21 2007 Michael Schwendt - 1.3.2-15 +* Tue Aug 21 2007 Michael Schwendt - 1.3.2-15 - rebuild per request on fedora-devel-list - clarify licence (GPLv2) -* Mon Mar 5 2007 Michael Schwendt +* Mon Mar 5 2007 Michael Schwendt - add umask 022 to scriptlets -* Sat Feb 24 2007 Michael Schwendt - 1.3.2-14 +* Sat Feb 24 2007 Michael Schwendt - 1.3.2-14 - patch for FLAC 1.1.4 API compatibility -* Sat Feb 24 2007 Michael Schwendt - 1.3.2-13 +* Sat Feb 24 2007 Michael Schwendt - 1.3.2-13 - patch ExportMP3.cpp (MPEG-2 Layer III bitrates resulted in broken/empty files) - convert locale related perl substitutions into patches (safer) @@ -220,7 +232,7 @@ umask 022 * Mon Aug 28 2006 Gerard Milmeister - 1.2.4-0.2.b - Rebuild for FE6 -* Fri Mar 17 2006 Michael Schwendt - 1.2.4-0.1.b +* Fri Mar 17 2006 Michael Schwendt - 1.2.4-0.1.b - Update to 1.2.4b (stable release). - Follow upstream recommendation and use the GTK+ 1.x wxGTK. This is because of various issues with fonts/layout/behaviour. @@ -239,7 +251,7 @@ umask 022 * Thu Apr 7 2005 Gerard Milmeister - 1.2.3-3 - Build gtk2 version by default -* Fri Apr 7 2005 Michael Schwendt +* Fri Apr 7 2005 Michael Schwendt - rebuilt * Tue Apr 5 2005 Gerard Milmeister - 1.2.3-2 @@ -248,7 +260,7 @@ umask 022 * Sat Nov 20 2004 Gerard Milmeister - 0:1.2.3-1 - New Version 1.2.3 -* Sat Oct 30 2004 Michael Schwendt - 0:1.2.2-0.fdr.1 +* Sat Oct 30 2004 Michael Schwendt - 0:1.2.2-0.fdr.1 - Update to 1.2.2, patch aboutdialog to be readable with wxGTK. * Mon May 10 2004 Gerard Milmeister - 0:1.2.1-0.fdr.1