Small bug fix, and rebuild for FC6.

This commit is contained in:
Quentin Spencer 2006-09-15 15:53:25 +00:00
parent 029b814d74
commit 908aa1aeca
3 changed files with 29 additions and 3 deletions

View File

@ -1 +0,0 @@
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild

21
octave-2.9.8-misc.patch Normal file
View File

@ -0,0 +1,21 @@
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) \

View File

@ -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 @@ applications which use GNU Octave.
%prep
%setup -q
%patch0 -p0
%build
@ -91,7 +93,7 @@ rm -rf $RPM_BUILD_ROOT
/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 @@ fi
%changelog
* Fri Sep 15 2006 Quentin Spencer <qspencer@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@users.sourceforge.net> 2.9.8-1
- New release. Remove old patch. This fixes bug #203676.