From 501e9b71c2ae55caf464753f2fca968011f42955 Mon Sep 17 00:00:00 2001 From: Quentin Spencer Date: Tue, 22 Apr 2008 20:48:18 +0000 Subject: [PATCH] New octave release. --- .cvsignore | 2 +- octave-3.0.0-gcc43.patch | 11 ----------- octave.spec | 11 ++++++----- sources | 2 +- 4 files changed, 8 insertions(+), 18 deletions(-) delete mode 100644 octave-3.0.0-gcc43.patch diff --git a/.cvsignore b/.cvsignore index 10fa600..13221e9 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -octave-3.0.0.tar.bz2 +octave-3.0.1.tar.bz2 diff --git a/octave-3.0.0-gcc43.patch b/octave-3.0.0-gcc43.patch deleted file mode 100644 index 69b89a9..0000000 --- a/octave-3.0.0-gcc43.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- octave-3.0.0/src/mxarray.h.in.gcc43 2007-10-23 18:32:44.000000000 -0600 -+++ octave-3.0.0/src/mxarray.h.in 2008-02-29 11:24:03.000000000 -0700 -@@ -46,6 +46,8 @@ - #if ! defined (MXARRAY_H) - #define MXARRAY_H - -+#include -+ - typedef enum - { - mxREAL = 0, diff --git a/octave.spec b/octave.spec index 7e66b5c..b5d59e2 100644 --- a/octave.spec +++ b/octave.spec @@ -2,15 +2,14 @@ %define octave_api api-v32 Name: octave -Version: 3.0.0 -Release: 6%{?dist} +Version: 3.0.1 +Release: 1%{?dist} Summary: A high-level language for numerical computations Epoch: 6 Group: Applications/Engineering License: GPLv3+ Source: ftp://ftp.octave.org/pub/octave/octave-%{version}.tar.bz2 -Patch: octave-3.0.0-gcc43.patch URL: http://www.octave.org Requires: gnuplot less info texinfo Requires(post): /sbin/install-info @@ -55,7 +54,6 @@ applications which use GNU Octave. %prep %setup -q -%patch -p1 -b .gcc43 # Check that octave_api is set correctly if ! grep -q '^#define OCTAVE_API_VERSION "%{octave_api}"' src/version.h then @@ -68,7 +66,7 @@ fi %define enable64 no export CPPFLAGS="-DH5_USE_16_API" %configure --enable-shared --disable-static --enable-64=%enable64 --with-f77=gfortran -make %{?_smp_mflags} OCTAVE_RELEASE="Fedora Extras %{version}-%{release}" +make %{?_smp_mflags} OCTAVE_RELEASE="Fedora %{version}-%{release}" %install @@ -143,6 +141,9 @@ fi %changelog +* Tue Apr 22 2008 Quentin Spencer 3.0.1-1 +- New release of octave. Remove gcc 4.3 patch. + * Mon Mar 3 2008 Alex Lancaster - 6:3.0.0-6 - Re-enable patch, but change cstring -> string.h so it works for C as well as C++. Hopefully this will #435600 for real. diff --git a/sources b/sources index 475a1cf..48143c7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d5512acdf60ac04398ff258cbc37f3c4 octave-3.0.0.tar.bz2 +230f3895a42386ec625bf2593a44c441 octave-3.0.1.tar.bz2