rpms/octave-forge/devel octave-forge-20080429-gcc43.patch, NONE, 1.1 octave-forge.spec, 1.54, 1.55

Quentin Spencer (qspencer) fedora-extras-commits at redhat.com
Thu May 1 14:11:37 UTC 2008


Author: qspencer

Update of /cvs/extras/rpms/octave-forge/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20606

Modified Files:
	octave-forge.spec 
Added Files:
	octave-forge-20080429-gcc43.patch 
Log Message:
Patch for compilation with gcc 4.3.

octave-forge-20080429-gcc43.patch:

--- NEW FILE octave-forge-20080429-gcc43.patch ---
--- main/ann-1.0/src/ann/src/kd_dump.cpp.orig	2008-05-01 09:00:50.000000000 -0500
+++ main/ann-1.0/src/ann/src/kd_dump.cpp	2008-05-01 09:00:26.000000000 -0500
@@ -33,6 +33,8 @@
 
 #include "kd_tree.h"					// kd-tree declarations
 #include "bd_tree.h"					// bd-tree declarations
+#include <stdlib>
+#include <string>
 
 using namespace std;					// make std:: available
 


Index: octave-forge.spec
===================================================================
RCS file: /cvs/extras/rpms/octave-forge/devel/octave-forge.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- octave-forge.spec	30 Apr 2008 20:57:12 -0000	1.54
+++ octave-forge.spec	1 May 2008 14:11:00 -0000	1.55
@@ -2,7 +2,7 @@
 
 Name:           octave-forge
 Version:        20080429
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Contributed functions for octave
 
 Group:          Applications/Engineering
@@ -17,6 +17,7 @@
 ## tar czf octave-forge-bundle-%{version}.patched.tar.gz octave-forge-bundle-%{version}
 ## rm -Rf octave-forge-bundle-%{version}
 Source0:        %{name}-bundle-%{version}.patched.tar.gz
+Patch0:         %{name}-20080429-gcc43.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:	octave(api) = %{octave_api} ImageMagick
@@ -136,6 +137,8 @@
    cd ..
 done
 
+%patch0
+
 #Install with -nodeps
 sed -i -e "s/pkg('install',/pkg('install','-nodeps',/" */*/Makefile
 
@@ -208,6 +211,9 @@
 
 
 %changelog
+* Thu May  1 2008 Quentin Spencer <qspencer at users.sf.net> 20080429-2
+- Patch so it will compile with gcc 4.3.
+
 * Wed Apr 30 2008 Quentin Spencer <qspencer at users.sf.net> 20080429-1
 - New release.
 - Add ftplib-devel as dependency.




More information about the fedora-extras-commits mailing list