rpms/octave-forge/F-8 octave-forge-20080429-gcc43.patch, NONE, 1.1 octave-forge.spec, 1.47, 1.48

[Quentin Spencer (qspencer)]

Author: qspencer

Update of /cvs/extras/rpms/octave-forge/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21930

Modified Files:
	octave-forge.spec 
Added Files:
	octave-forge-20080429-gcc43.patch 
Log Message:
This branch needs the gcc 4.3 patch also (mainly the -fPIC flag).

octave-forge-20080429-gcc43.patch:

--- NEW FILE octave-forge-20080429-gcc43.patch ---
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 12:48:01.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 12:48:01.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/Make-config octave-forge-bundle-20080429/main/ann-1.0/src/ann/Make-config
--- octave-forge-bundle-20080429.orig/main/ann-1.0/src/ann/Make-config	2008-04-28 12:08:55.000000000 -0500
+++ octave-forge-bundle-20080429/main/ann-1.0/src/ann/Make-config	2008-05-01 12:48:38.000000000 -0500
@@ -72,7 +72,7 @@
 	$(MAKE) targets \
 	"ANNLIB = libANN.a" \
 	"C++ = g++" \
-	"CFLAGS = -O3" \
+	"CFLAGS = -fPIC -O3" \
 	"MAKELIB = ar ruv" \
 	"RANLIB = true"
 
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 12:48:01.000000000 -0500
@@ -33,6 +33,8 @@
 
 #include "kd_tree.h"					// kd-tree declarations
 #include "bd_tree.h"					// bd-tree declarations
+#include <cstdlib>
+#include <cstring>
 
 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 12:48:01.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/F-8/octave-forge.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- octave-forge.spec	2 May 2008 19:22:31 -0000	1.47
+++ octave-forge.spec	2 May 2008 19:41:08 -0000	1.48
@@ -2,7 +2,7 @@
 
 Name:           octave-forge
 Version:        20080429
-Release:        1%{?dist}
+Release:        1%{?dist}.1
 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 -p1
+
 #Install with -nodeps
 sed -i -e "s/pkg('install',/pkg('install','-nodeps',/" */*/Makefile
 
@@ -208,6 +211,9 @@
 
 
 %changelog
+* Fri May  2 2008 Quentin Spencer <qspencer at users.sf.net> 20080429-1.fc8.1
+- This branch needs the gcc 4.3 patch also.
+
 * Fri May  2 2008 Quentin Spencer <qspencer at users.sf.net> 20080429-1
 - New release.
 - Add ftplib-devel as dependency.