rpms/octave/devel octave-3.0.0-gcc43.patch, NONE, 1.1 octave.spec, 1.69, 1.70

[Orion Poplawski (orion)]

Author: orion

Update of /cvs/pkgs/rpms/octave/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16561

Modified Files:
	octave.spec 
Added Files:
	octave-3.0.0-gcc43.patch 
Log Message:
* Fri Feb 29 2008 Orion Poplawski <orion at cora.nwra.com> 3.0.0-4
- Rebuild for hdf5 1.8.0 using compatability API define
- Add gcc43 patch


octave-3.0.0-gcc43.patch:

--- NEW FILE octave-3.0.0-gcc43.patch ---
--- octave-3.0.0/src/mxarray.h.in.gcc43	2007-10-23 18:32:44.000000000 -0600
+++ octave-3.0.0/src/mxarray.h.in	2008-02-29 11:24:03.000000000 -0700
@@ -46,6 +46,8 @@
 #if ! defined (MXARRAY_H)
 #define MXARRAY_H
 
+#include <cstring>
+
 typedef enum
   {
     mxREAL = 0,


Index: octave.spec
===================================================================
RCS file: /cvs/pkgs/rpms/octave/devel/octave.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- octave.spec	19 Feb 2008 20:28:19 -0000	1.69
+++ octave.spec	29 Feb 2008 22:55:31 -0000	1.70
@@ -3,13 +3,14 @@
 
 Name:           octave
 Version:        3.0.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A high-level language for numerical computations
 Epoch:          6
 
 Group:          Applications/Engineering
 License:        GPLv3+
 Source:         ftp://ftp.octave.org/pub/octave/octave-%{version}.tar.bz2
+Patch:          octave-3.0.0-gcc43.patch
 URL:            http://www.octave.org
 Requires:       gnuplot less info texinfo 
 Requires(post): /sbin/install-info
@@ -54,6 +55,7 @@
 
 %prep
 %setup -q
+%patch -p1 -b .gcc43
 # Check that octave_api is set correctly
 if ! grep -q '^#define OCTAVE_API_VERSION "%{octave_api}"' src/version.h
 then
@@ -64,6 +66,7 @@
 
 %build
 %define enable64 no
+export CPPFLAGS="-DH5_USE_16_API"
 %configure --enable-shared --disable-static --enable-64=%enable64 --with-f77=gfortran
 make %{?_smp_mflags} OCTAVE_RELEASE="Fedora Extras %{version}-%{release}"
 
@@ -140,6 +143,10 @@
 
 
 %changelog
+* Fri Feb 29 2008 Orion Poplawski <orion at cora.nwra.com> 3.0.0-4
+- Rebuild for hdf5 1.8.0 using compatability API define
+- Add gcc43 patch
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 6:3.0.0-3
 - Autorebuild for GCC 4.3