rpms/octave-forge/devel octave-forge-20080429-gcc43.patch, 1.2, 1.3 octave-forge.spec, 1.56, 1.57

[Quentin Spencer (qspencer)]

Author: qspencer

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

Modified Files:
	octave-forge-20080429-gcc43.patch octave-forge.spec 
Log Message:
Extend gcc 4.3 patch to some additional files.

octave-forge-20080429-gcc43.patch:

Index: octave-forge-20080429-gcc43.patch
===================================================================
RCS file: /cvs/extras/rpms/octave-forge/devel/octave-forge-20080429-gcc43.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- octave-forge-20080429-gcc43.patch	1 May 2008 14:24:13 -0000	1.2
+++ octave-forge-20080429-gcc43.patch	1 May 2008 15:04:22 -0000	1.3
@@ -1,5 +1,31 @@
---- 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
+diff -ur octave-forge-bundle-20080429.orig/main/ann-1.0/src/ann/ann2fig/ann2fig.cpp octave-forge-bundle-20080429/main/ann-1.0/src/ann/ann2fig/ann2fig.cpp
+--- octave-forge-bundle-20080429.orig/main/ann-1.0/src/ann/ann2fig/ann2fig.cpp	2008-04-28 12:08:50.000000000 -0500
++++ octave-forge-bundle-20080429/main/ann-1.0/src/ann/ann2fig/ann2fig.cpp	2008-05-01 10:02:17.000000000 -0500
+@@ -42,7 +42,8 @@
+ 
+ #include <cstdio>						// C standard I/O
+ #include <fstream>						// file I/O
+-#include <string>						// string manipulation
++#include <cstring>						// string manipulation
++#include <cstdlib>
+ #include <ANN/ANNx.h>					// all ANN includes
+ 
+ using namespace std;					// make std:: accessible
+diff -ur octave-forge-bundle-20080429.orig/main/ann-1.0/src/ann/bindings/ann_wrap.cpp octave-forge-bundle-20080429/main/ann-1.0/src/ann/bindings/ann_wrap.cpp
+--- octave-forge-bundle-20080429.orig/main/ann-1.0/src/ann/bindings/ann_wrap.cpp	2008-04-28 12:08:55.000000000 -0500
++++ octave-forge-bundle-20080429/main/ann-1.0/src/ann/bindings/ann_wrap.cpp	2008-05-01 09:58:59.000000000 -0500
+@@ -8,6 +8,8 @@
+  * interface file instead. 
+  * ----------------------------------------------------------------------------- */
+ 
++#include <cstring>
++
+ #define SWIG_name_d      "ann"
+ #define SWIG_name        ann
+ 
+diff -ur octave-forge-bundle-20080429.orig/main/ann-1.0/src/ann/src/kd_dump.cpp octave-forge-bundle-20080429/main/ann-1.0/src/ann/src/kd_dump.cpp
+--- octave-forge-bundle-20080429.orig/main/ann-1.0/src/ann/src/kd_dump.cpp	2008-04-28 12:08:54.000000000 -0500
++++ octave-forge-bundle-20080429/main/ann-1.0/src/ann/src/kd_dump.cpp	2008-05-01 09:47:39.000000000 -0500
 @@ -33,6 +33,8 @@
  
  #include "kd_tree.h"					// kd-tree declarations
@@ -9,3 +35,17 @@
  
  using namespace std;					// make std:: available
  
+diff -ur octave-forge-bundle-20080429.orig/main/ann-1.0/src/ann/test/ann_test.cpp octave-forge-bundle-20080429/main/ann-1.0/src/ann/test/ann_test.cpp
+--- octave-forge-bundle-20080429.orig/main/ann-1.0/src/ann/test/ann_test.cpp	2008-04-28 12:08:50.000000000 -0500
++++ octave-forge-bundle-20080429/main/ann-1.0/src/ann/test/ann_test.cpp	2008-05-01 10:00:12.000000000 -0500
+@@ -36,8 +36,9 @@
+ 
+ #include <ctime>						// clock
+ #include <cmath>						// math routines
+-#include <string>						// C string ops
++#include <cstring>						// C string ops
+ #include <fstream>						// file I/O
++#include <cstdlib>
+ 
+ #include <ANN/ANN.h>					// ANN declarations
+ #include <ANN/ANNx.h>					// more ANN declarations


Index: octave-forge.spec
===================================================================
RCS file: /cvs/extras/rpms/octave-forge/devel/octave-forge.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- octave-forge.spec	1 May 2008 14:24:13 -0000	1.56
+++ octave-forge.spec	1 May 2008 15:04:22 -0000	1.57
@@ -2,7 +2,7 @@
 
 Name:           octave-forge
 Version:        20080429
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Contributed functions for octave
 
 Group:          Applications/Engineering
@@ -137,7 +137,7 @@
    cd ..
 done
 
-%patch0
+%patch0 -p1
 
 #Install with -nodeps
 sed -i -e "s/pkg('install',/pkg('install','-nodeps',/" */*/Makefile
@@ -211,6 +211,9 @@
 
 
 %changelog
+* Thu May  1 2008 Quentin Spencer <qspencer at users.sf.net> 20080429-4
+- Extend the gcc 4.3 patch to more files.
+
 * Thu May  1 2008 Quentin Spencer <qspencer at users.sf.net> 20080429-3
 - Fix the gcc 4.3 patch.