diff --git a/.cvsignore b/.cvsignore index 2ce161c..5b2575b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -octave-2.1.71.tar.bz2 +octave-2.9.3.tar.bz2 diff --git a/octave-2.1.71-save.patch b/octave-2.1.71-save.patch deleted file mode 100644 index d4591ee..0000000 --- a/octave-2.1.71-save.patch +++ /dev/null @@ -1,24 +0,0 @@ -src/ChangeLog: - -2005-05-27 John W. Eaton - - * ls-mat5.cc (save_mat5_binary_element): Extract complex N-d - array, not matrix. - - -Index: src/ls-mat5.cc -=================================================================== -RCS file: /usr/local/cvsroot/octave/src/ls-mat5.cc,v -retrieving revision 1.8.2.5 -diff -u -r1.8.2.5 ls-mat5.cc ---- src/ls-mat5.cc 5 May 2005 03:53:38 -0000 1.8.2.5 -+++ src/ls-mat5.cc 27 May 2005 14:14:32 -0000 -@@ -1180,7 +1180,7 @@ - } - else if (tc.is_complex_scalar () || tc.is_complex_matrix ()) - { -- ComplexNDArray m_cmplx = tc.complex_matrix_value (); -+ ComplexNDArray m_cmplx = tc.complex_array_value (); - - write_mat5_array (os, ::real (m_cmplx), save_as_floats); - write_mat5_array (os, ::imag (m_cmplx), save_as_floats); diff --git a/octave.spec b/octave.spec index 3dc83cc..b3e83ea 100644 --- a/octave.spec +++ b/octave.spec @@ -1,21 +1,21 @@ %define __libtoolize /bin/true Name: octave -Version: 2.1.71 -Release: 13%{?dist} +Version: 2.9.3 +Release: 1%{?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.1.71-save.patch URL: http://www.octave.org Requires: gnuplot less info texinfo Requires: /sbin/install-info BuildPrereq: gnuplot bison flex less tetex gcc-gfortran lapack blas BuildPrereq: ncurses-devel zlib-devel libtermcap-devel hdf5-devel BuildPrereq: readline-devel glibc-devel fftw3-devel autoconf gperf +BuildPrereq: umfpack-devel Prereq: /sbin/ldconfig BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: /etc/ld.so.conf.d @@ -48,7 +48,6 @@ applications which use GNU Octave. %prep %setup -q -%patch0 -p0 ./autogen.sh @@ -128,8 +127,9 @@ fi %changelog -* Wed Jul 06 2005 Quentin Spencer 2.1.71-13 -- Rebuild +* Tue Jul 26 2005 Quentin Spencer 2.9.3-1 +- Move to new 2.9.x development tree. +- Add umfpack-devel as new build dependency. * Tue Jul 05 2005 Quentin Spencer 2.1.71-12 - Require hdf5-devel for build. diff --git a/sources b/sources index a9ed486..5b28d24 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2ab06912017c833549035111f0ab592f octave-2.1.71.tar.bz2 +bb2e0ea0159e592c87d74e8d3fdf9125 octave-2.9.3.tar.bz2