From e1b35870a8b6c536171fae420c3bbef6175ad8b7 Mon Sep 17 00:00:00 2001 From: alexlan Date: Mar 03 2008 08:38:05 +0000 Subject: - Re-enable patch, but change cstring -> string.h so it works for C as well as C++ --- diff --git a/octave-3.0.0-gcc43.patch b/octave-3.0.0-gcc43.patch index f60948a..69b89a9 100644 --- a/octave-3.0.0-gcc43.patch +++ b/octave-3.0.0-gcc43.patch @@ -4,7 +4,7 @@ #if ! defined (MXARRAY_H) #define MXARRAY_H -+#include ++#include + typedef enum { diff --git a/octave.spec b/octave.spec index 0f20252..bf66268 100644 --- a/octave.spec +++ b/octave.spec @@ -3,14 +3,14 @@ Name: octave Version: 3.0.0 -Release: 5%{?dist} +Release: 6%{?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 +Patch: octave-3.0.0-gcc43.patch URL: http://www.octave.org Requires: gnuplot less info texinfo Requires(post): /sbin/install-info @@ -55,7 +55,7 @@ applications which use GNU Octave. %prep %setup -q -## patch -p1 -b .gcc43 +%patch -p1 -b .gcc43 # Check that octave_api is set correctly if ! grep -q '^#define OCTAVE_API_VERSION "%{octave_api}"' src/version.h then @@ -143,6 +143,10 @@ fi %changelog +* 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++ + * Sun Mar 2 2008 Alex Lancaster - 6:3.0.0-5 - Backout GCC 4.3 patch temporarily, causes trouble for octave-forge and may not be necessary (#435600)