rpms/octave/devel octave-2.9.8-misc.patch, NONE, 1.1 octave.spec, 1.46, 1.47 needs.rebuild, 1.1, NONE

[Quentin Spencer (qspencer)]

Author: qspencer

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

Modified Files:
	octave.spec 
Added Files:
	octave-2.9.8-misc.patch 
Removed Files:
	needs.rebuild 
Log Message:
Small bug fix, and rebuild for FC6.

octave-2.9.8-misc.patch:

--- NEW FILE octave-2.9.8-misc.patch ---
Index: liboctave/mx-inlines.cc
===================================================================
RCS file: /cvs/octave/liboctave/mx-inlines.cc,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- liboctave/mx-inlines.cc	22 Aug 2006 18:37:43 -0000	1.49
+++ liboctave/mx-inlines.cc	26 Aug 2006 03:02:39 -0000	1.50
@@ -383,6 +383,12 @@
         } \
     } \
  \
+  if (nd == 2 && dv(0) == 0 && dv(1) == 0) \
+    { \
+      retval.resize (dim_vector (1, 1), INIT_VAL); \
+      return retval; \
+    } \
+ \
   /* We need to find first non-singleton dim.  */ \
  \
   if (dim == -1) \


Index: octave.spec
===================================================================
RCS file: /cvs/extras/rpms/octave/devel/octave.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- octave.spec	25 Aug 2006 16:15:24 -0000	1.46
+++ octave.spec	15 Sep 2006 15:53:25 -0000	1.47
@@ -1,12 +1,13 @@
 Name:           octave
 Version:        2.9.8
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A high-level language for numerical computations
 Epoch:          6
 
 Group:          Applications/Engineering
 License:        GPL
 Source:         ftp://ftp.octave.org/pub/octave/bleeding-edge/octave-%{version}.tar.bz2
+Patch0:         octave-2.9.8-misc.patch
 URL:            http://www.octave.org
 Requires:       gnuplot less info texinfo 
 Requires(post): /sbin/install-info
@@ -49,6 +50,7 @@
 
 %prep
 %setup -q
+%patch0 -p0
 
 
 %build
@@ -91,7 +93,7 @@
 /sbin/ldconfig
 /sbin/install-info --info-dir=%{_infodir} --section="Programming" \
 	%{_infodir}/octave.info.gz
- 
+
 %preun
 if [ "$1" = "0" ]; then
    /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/octave.info.gz
@@ -123,6 +125,10 @@
 
 
 %changelog
+* Fri Sep 15 2006 Quentin Spencer <qspencer at users.sourceforge.net> 2.9.8-2
+- Fix this bug:
+  https://www.cae.wisc.edu/pipermail/bug-octave/2006-September/000687.html
+
 * Fri Aug 25 2006 Quentin Spencer <qspencer at users.sourceforge.net> 2.9.8-1
 - New release. Remove old patch. This fixes bug #203676.
 


--- needs.rebuild DELETED ---