rpms/octave-forge/devel octave-forge-20080429-gcc43.patch, 1.3, 1.4 octave-forge.spec, 1.57, 1.58

[Quentin Spencer (qspencer)]

Author: qspencer

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

Modified Files:
	octave-forge-20080429-gcc43.patch octave-forge.spec 
Log Message:
Modify the patch to fix compile flags in a subpackage.

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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- octave-forge-20080429-gcc43.patch	1 May 2008 15:04:22 -0000	1.3
+++ octave-forge-20080429-gcc43.patch	1 May 2008 17:50:13 -0000	1.4
@@ -1,6 +1,6 @@
 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
++++ 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
@@ -13,7 +13,7 @@
  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
++++ 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. 
   * ----------------------------------------------------------------------------- */
@@ -23,9 +23,21 @@
  #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 09:47:39.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
@@ -37,7 +49,7 @@
  
 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
++++ 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


Index: octave-forge.spec
===================================================================
RCS file: /cvs/extras/rpms/octave-forge/devel/octave-forge.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- octave-forge.spec	1 May 2008 15:04:22 -0000	1.57
+++ octave-forge.spec	1 May 2008 17:50:13 -0000	1.58
@@ -2,7 +2,7 @@
 
 Name:           octave-forge
 Version:        20080429
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Contributed functions for octave
 
 Group:          Applications/Engineering
@@ -211,6 +211,9 @@
 
 
 %changelog
+* Thu May  1 2008 Quentin Spencer <qspencer at users.sf.net> 20080429-5
+- Modify the patch to fix compile flags in a subpackage.
+
 * Thu May  1 2008 Quentin Spencer <qspencer at users.sf.net> 20080429-4
 - Extend the gcc 4.3 patch to more files.