rpms/octave/devel octave.spec, 1.71, 1.72 octave-3.0.0-gcc43.patch, 1.1, 1.2
Alex Lancaster (alexlan)
fedora-extras-commits at redhat.com
Mon Mar 3 08:38:58 UTC 2008
Author: alexlan
Update of /cvs/pkgs/rpms/octave/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18684
Modified Files:
octave.spec octave-3.0.0-gcc43.patch
Log Message:
* 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++
Index: octave.spec
===================================================================
RCS file: /cvs/pkgs/rpms/octave/devel/octave.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- octave.spec 2 Mar 2008 12:44:40 -0000 1.71
+++ octave.spec 3 Mar 2008 08:38:05 -0000 1.72
@@ -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 @@
%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 @@
%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
- Backout GCC 4.3 patch temporarily, causes trouble for octave-forge and
may not be necessary (#435600)
octave-3.0.0-gcc43.patch:
Index: octave-3.0.0-gcc43.patch
===================================================================
RCS file: /cvs/pkgs/rpms/octave/devel/octave-3.0.0-gcc43.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- octave-3.0.0-gcc43.patch 29 Feb 2008 22:55:31 -0000 1.1
+++ octave-3.0.0-gcc43.patch 3 Mar 2008 08:38:05 -0000 1.2
@@ -4,7 +4,7 @@
#if ! defined (MXARRAY_H)
#define MXARRAY_H
-+#include <cstring>
++#include <string.h>
+
typedef enum
{
More information about the fedora-extras-commits
mailing list