rpms/audacity/devel audacity-1.3.6-libdir.patch, NONE, 1.1.2.1 audacity.spec, 1.58, 1.58.2.1 audacity-1.3.4-libdir.patch, 1.2, NONE audacity-1.3.5-fr.patch, 1.1, NONE audacity-1.3.5-gcc43.patch, 1.1, NONE
Michael Schwendt
mschwendt at fedoraproject.org
Fri Oct 24 11:19:17 UTC 2008
Author: mschwendt
Update of /cvs/pkgs/rpms/audacity/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32672
Modified Files:
Tag: audacity-1_3_6-test
audacity.spec
Added Files:
Tag: audacity-1_3_6-test
audacity-1.3.6-libdir.patch
Removed Files:
Tag: audacity-1_3_6-test
audacity-1.3.4-libdir.patch audacity-1.3.5-fr.patch
audacity-1.3.5-gcc43.patch
Log Message:
- A first brief look at 1.3.6-beta in a test branch again.
- ffmpeg headers in the tarball. See what API version it is and how
it is used exactly, because ffmpeg main code is not in Fedora.
audacity-1.3.6-libdir.patch:
--- NEW FILE audacity-1.3.6-libdir.patch ---
diff -Nur audacity-src-1.3.6-orig/lib-src/libvamp/vamp-sdk/PluginHostAdapter.cpp audacity-src-1.3.6/lib-src/libvamp/vamp-sdk/PluginHostAdapter.cpp
--- audacity-src-1.3.6-orig/lib-src/libvamp/vamp-sdk/PluginHostAdapter.cpp 2008-10-24 08:56:28.000000000 +0200
+++ audacity-src-1.3.6/lib-src/libvamp/vamp-sdk/PluginHostAdapter.cpp 2008-10-24 12:59:29.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:/usr/__RPM_LIB__/vamp"
#endif
#endif
diff -Nur audacity-src-1.3.6-orig/src/effects/ladspa/LoadLadspa.cpp audacity-src-1.3.6/src/effects/ladspa/LoadLadspa.cpp
--- audacity-src-1.3.6-orig/src/effects/ladspa/LoadLadspa.cpp 2008-10-24 08:56:32.000000000 +0200
+++ audacity-src-1.3.6/src/effects/ladspa/LoadLadspa.cpp 2008-10-24 13:01:10.000000000 +0200
@@ -279,7 +279,7 @@
#ifdef __WXGTK__
wxGetApp().AddUniquePathToPathList(wxT(INSTALL_PREFIX) wxT("/ladspa"), pathList);
- wxGetApp().AddUniquePathToPathList(wxT("/usr/local/lib/ladspa"), pathList);
+ wxGetApp().AddUniquePathToPathList(wxT("/usr/local/__RPM_LIB__/ladspa"), pathList);
wxGetApp().AddUniquePathToPathList(wxT(LIBDIR) wxT("/ladspa"), pathList);
#endif
Index: audacity.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacity/devel/audacity.spec,v
retrieving revision 1.58
retrieving revision 1.58.2.1
diff -u -r1.58 -r1.58.2.1
--- audacity.spec 15 Oct 2008 22:48:20 -0000 1.58
+++ audacity.spec 24 Oct 2008 11:18:47 -0000 1.58.2.1
@@ -1,24 +1,24 @@
# Compile options:
# --with mp3 : enable mp3 support
-%define tartopdir audacity-src-1.3.5-beta
+#define tartopdir audacity-src-1.3.6-beta
+%define tartopdir audacity-src-1.3.6
Name: audacity
-Version: 1.3.5
-Release: 0.6.beta%{?dist}
+Version: 1.3.6
+Release: 0.1.beta%{?dist}
Summary: Multitrack audio editor
Group: Applications/Multimedia
License: GPLv2
URL: http://audacity.sourceforge.net
-Source0: http://downloads.sf.net/sourceforge/audacity/audacity-src-1.3.5.tar.bz2
+Source0: http://homerow.net/audacity/audacity-src-1.3.6.tar.gz
+#Source0: http://downloads.sf.net/sourceforge/audacity/audacity-src-1.3.6.tar.bz2
Source1: audacity.png
Source2: audacity.desktop
Patch1: audacity-1.3.4-libmp3lame-default.patch
-Patch2: audacity-1.3.4-libdir.patch
-Patch3: audacity-1.3.5-gcc43.patch
-Patch4: audacity-1.3.5-fr.patch
+Patch2: audacity-1.3.6-libdir.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: alsa-lib-devel
@@ -54,16 +54,13 @@
# 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/AudacityApp.cpp lib-src/libvamp/vamp-sdk/PluginHostAdapter.cpp
do
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
-%patch3 -p1 -b .gcc43
-%patch4 -p1 -b .fr
-
# Substitute occurences of "libmp3lame.so" with "libmp3lame.so.0".
for i in locale/*.po src/export/ExportMP3.cpp
do
@@ -133,6 +130,12 @@
%changelog
+* Fri Oct 24 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 1.3.6-0.1.beta
+- prepare upgrade with Leland's 1.3.6-beta tarball
+- fr.po patch merged upstream
+- gcc43 patch merged upstream
+- libdir patch rediffed and obsolete parts dropped
+
* Thu Aug 28 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 1.3.5-0.6.beta
- rediff some patches for Fedora fuzz=0 pedantry
--- audacity-1.3.4-libdir.patch DELETED ---
--- audacity-1.3.5-fr.patch DELETED ---
--- audacity-1.3.5-gcc43.patch DELETED ---
More information about the scm-commits
mailing list