rpms/octave-forge/devel octave-forge-2006.01.28.patch, 1.2, 1.3 octave-forge.spec, 1.18, 1.19

[Quentin Spencer (qspencer)]

Author: qspencer

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

Modified Files:
	octave-forge-2006.01.28.patch octave-forge.spec 
Log Message:
Add to patch to correctly handle 64-bit archs.

octave-forge-2006.01.28.patch:

Index: octave-forge-2006.01.28.patch
===================================================================
RCS file: /cvs/extras/rpms/octave-forge/devel/octave-forge-2006.01.28.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- octave-forge-2006.01.28.patch	3 Feb 2006 21:56:39 -0000	1.2
+++ octave-forge-2006.01.28.patch	18 Feb 2006 06:44:13 -0000	1.3
@@ -58,3 +58,45 @@
  endif
  
  all: conv2.oct cordflt2.oct bwlabel.oct bwfill.oct rotate_scale.oct \
+Index: main/octcdf/ov-ncatt.h
+===================================================================
+diff -ruP octave-forge-2006.01.28.orig/main/octcdf/ov-ncatt.h octave-forge-2006.01.28/main/octcdf/ov-ncatt.h
+--- main/octcdf/ov-ncatt.h	2006-01-09 15:02:37.000000000 -0600
++++ main/octcdf/ov-ncatt.h	2006-02-18 00:11:53.000000000 -0600
+@@ -66,7 +66,7 @@
+ 
+   int ndims() const  { return dims().length(); }
+ 
+-  int numel() const  { return dims().numel(); }
++  octave_idx_type numel() const  { return dims().numel(); }
+ 
+   dim_vector dims() const {  return nca->dimvec; }
+ 
+Index: main/octcdf/ov-ncdim.h
+===================================================================
+diff -ruP octave-forge-2006.01.28.orig/main/octcdf/ov-ncdim.h octave-forge-2006.01.28/main/octcdf/ov-ncdim.h
+--- main/octcdf/ov-ncdim.h	2006-01-09 15:02:37.000000000 -0600
++++ main/octcdf/ov-ncdim.h	2006-02-18 00:12:55.000000000 -0600
+@@ -66,7 +66,7 @@
+ 
+   int ndims() const  { return 1; }
+ 
+-  int numel() const  { return  ncd->length; }
++  octave_idx_type numel() const  { return  ncd->length; }
+ 
+   dim_vector dims() const {  return dim_vector(ncd->length,1); }
+ 
+Index: main/octcdf/ov-ncvar.h
+===================================================================
+diff -ruP octave-forge-2006.01.28.orig/main/octcdf/ov-ncvar.h octave-forge-2006.01.28/main/octcdf/ov-ncvar.h
+--- main/octcdf/ov-ncvar.h	2006-01-25 14:31:07.000000000 -0600
++++ main/octcdf/ov-ncvar.h	2006-02-18 00:05:46.000000000 -0600
+@@ -80,7 +80,7 @@
+ 
+   int ndims() const  { return dims().length(); }
+ 
+-  int numel() const  { return dims().numel(); }
++  octave_idx_type numel() const  { return dims().numel(); }
+ 
+   // Get dim_vector following Octave conventions
+   dim_vector dims() const {  return ncv->dimvec; }


Index: octave-forge.spec
===================================================================
RCS file: /cvs/extras/rpms/octave-forge/devel/octave-forge.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- octave-forge.spec	17 Feb 2006 13:43:31 -0000	1.18
+++ octave-forge.spec	18 Feb 2006 06:44:13 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           octave-forge
 Version:        2006.01.28
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Contributed functions for octave
 
 Group:          Applications/Engineering
@@ -72,6 +72,9 @@
 
 
 %changelog
+* Sat Feb 18 2006 Quentin Spencer <qspencer at users.sf.net> 2005.06.13-5
+- Amend patch0 to correctly deal with 64-bit indexing.
+
 * Thu Feb 16 2006 Quentin Spencer <qspencer at users.sf.net> 2005.06.13-4
 - Patch the fixed point code so that g++ 4.1 compiles it.