- Re-enable patch, but change cstring -> string.h so it works for C as well

as C++
This commit is contained in:
alexlan 2008-03-03 08:38:05 +00:00
parent 4d5a606492
commit e1b35870a8
2 changed files with 8 additions and 4 deletions

View File

@ -4,7 +4,7 @@
#if ! defined (MXARRAY_H) #if ! defined (MXARRAY_H)
#define MXARRAY_H #define MXARRAY_H
+#include <cstring> +#include <string.h>
+ +
typedef enum typedef enum
{ {

View File

@ -3,14 +3,14 @@
Name: octave Name: octave
Version: 3.0.0 Version: 3.0.0
Release: 5%{?dist} Release: 6%{?dist}
Summary: A high-level language for numerical computations Summary: A high-level language for numerical computations
Epoch: 6 Epoch: 6
Group: Applications/Engineering Group: Applications/Engineering
License: GPLv3+ License: GPLv3+
Source: ftp://ftp.octave.org/pub/octave/octave-%{version}.tar.bz2 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 URL: http://www.octave.org
Requires: gnuplot less info texinfo Requires: gnuplot less info texinfo
Requires(post): /sbin/install-info Requires(post): /sbin/install-info
@ -55,7 +55,7 @@ applications which use GNU Octave.
%prep %prep
%setup -q %setup -q
## patch -p1 -b .gcc43 %patch -p1 -b .gcc43
# Check that octave_api is set correctly # Check that octave_api is set correctly
if ! grep -q '^#define OCTAVE_API_VERSION "%{octave_api}"' src/version.h if ! grep -q '^#define OCTAVE_API_VERSION "%{octave_api}"' src/version.h
then then
@ -143,6 +143,10 @@ fi
%changelog %changelog
* Mon Mar 3 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 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 <alexlan[AT]fedoraproject org> - 6:3.0.0-5 * Sun Mar 2 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 6:3.0.0-5
- Backout GCC 4.3 patch temporarily, causes trouble for octave-forge and - Backout GCC 4.3 patch temporarily, causes trouble for octave-forge and
may not be necessary (#435600) may not be necessary (#435600)