diff --git a/needs.rebuild b/needs.rebuild deleted file mode 100644 index 815fd29..0000000 --- a/needs.rebuild +++ /dev/null @@ -1 +0,0 @@ -http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild diff --git a/octave-2.9.8-misc.patch b/octave-2.9.8-misc.patch new file mode 100644 index 0000000..1fc654f --- /dev/null +++ b/octave-2.9.8-misc.patch @@ -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) \ diff --git a/octave.spec b/octave.spec index 206d9f6..b48bab2 100644 --- a/octave.spec +++ b/octave.spec @@ -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 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 2.9.8-1 - New release. Remove old patch. This fixes bug #203676.