rpms/audacity-freeworld/devel audacity-1.3.5-gcc43.patch, NONE, 1.1 audacity-freeworld.spec, 1.3, 1.4
Author: dtimms
Update of /cvs/free/rpms/audacity-freeworld/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv20221
Modified Files:
audacity-freeworld.spec
Added Files:
audacity-1.3.5-gcc43.patch
Log Message:
fix build with patch --fuzz=0
add Requires: lame-libs
audacity-1.3.5-gcc43.patch:
--- NEW FILE audacity-1.3.5-gcc43.patch ---
diff -Nur audacity-src-1.3.5-beta-orig/lib-src/libvamp/vamp-sdk/PluginAdapter.cpp
audacity-src-1.3.5-beta/lib-src/libvamp/vamp-sdk/PluginAdapter.cpp
--- audacity-src-1.3.5-beta-orig/lib-src/libvamp/vamp-sdk/PluginAdapter.cpp 2008-05-08
07:19:58.000000000 +1000
+++ audacity-src-1.3.5-beta/lib-src/libvamp/vamp-sdk/PluginAdapter.cpp 2008-08-22
00:16:54.000000000 +1000
@@ -38,6 +38,7 @@
#include <cstring>
#include <cstdlib>
+using namespace std;
//#define DEBUG_PLUGIN_ADAPTER 1
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-08
07:19:58.000000000 +1000
+++ audacity-src-1.3.5-beta/lib-src/libvamp/vamp-sdk/PluginHostAdapter.cpp 2008-08-22
00:20:02.000000000 +1000
@@ -64,7 +64,7 @@
std::vector<std::string> path;
std::string envPath;
- char *cpath = getenv("VAMP_PATH");
+ char *cpath = std::getenv("VAMP_PATH");
if (cpath) envPath = cpath;
#ifdef _WIN32
@@ -81,7 +81,7 @@
if (envPath == "") {
envPath = DEFAULT_VAMP_PATH;
- char *chome = getenv("HOME");
+ char *chome = std::getenv("HOME");
if (chome) {
std::string home(chome);
std::string::size_type f;
Index: audacity-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/audacity-freeworld/devel/audacity-freeworld.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- audacity-freeworld.spec 18 Aug 2008 12:30:38 -0000 1.3
+++ audacity-freeworld.spec 21 Aug 2008 14:41:05 -0000 1.4
@@ -3,7 +3,7 @@
Name: audacity-freeworld
Version: 1.3.5
-Release: 0.2.beta%{?dist}
+Release: 0.3.beta%{?dist}
Summary: Multitrack audio editor
Group: Applications/Multimedia
License: GPLv2
@@ -14,7 +14,7 @@
Source2: audacity.desktop
Patch1: audacity-1.3.4-libdir.patch
-Patch2: audacity-1.3.4-gcc43.patch
+Patch2: audacity-1.3.5-gcc43.patch
Patch3: audacity-1.3.4-libmp3lame-default.patch
Patch4: audacity-1.3.5-fr.patch
@@ -64,6 +64,8 @@
# for 1.3.2-beta
BuildRequires: compat-wxGTK26-devel
+Requires: lame-libs
+
%description
Audacity is a cross-platform multitrack audio editor. It allows you to
@@ -92,7 +94,7 @@
done
grep -q -s __RPM_LIB * -R && exit 1
-%patch2 -p1 -b .gcc43
+%patch2 -p1 -bu .gcc43
%patch4 -p1 -b .fr
# Substitute occurences of "libmp3lame.so" with "libmp3lame.so.0".
@@ -242,8 +244,13 @@
%changelog
+* Thu Aug 22 2008 David Timms <iinet.net.au@dtimms> - 1.3.5-0.3.beta
+- add Requires lame-libs
+- update 1.3.4-gcc43.patch to suit 1.3.5, since patch mostly upstreamed.
+
* Mon Aug 18 2008 David Timms <iinet.net.au@dtimms> - 1.3.5-0.2.beta
-- rename spec and Name to audacity-freeworld. ToDo: complete the changes.
+- rename spec and Name to audacity-freeworld.
+- add provides/obsoletes audacity-nonfree.
- import livna package into rpmfusion.
* Sun Jun 8 2008 Michael Schwendt <mschwendt(a)users.sf.net> - 1.3.5-0.1.beta