diff --git a/octave-2.9.5-config.patch b/octave-2.9.5-config.patch new file mode 100644 index 0000000..032cfd5 --- /dev/null +++ b/octave-2.9.5-config.patch @@ -0,0 +1,20 @@ +--- configure.orig 2006-04-18 08:22:38.000000000 -0500 ++++ configure 2006-04-18 08:30:46.000000000 -0500 +@@ -3291,7 +3291,7 @@ + echo "$as_me:$LINENO: result: defining localfcnfiledir to be $localfcnfiledir" >&5 + echo "${ECHO_T}defining localfcnfiledir to be $localfcnfiledir" >&6 + +-: ${localapifcnfiledir='$(datadir)/octave/site/$(apiversion)/m'} ++: ${localapifcnfiledir='$(datadir)/octave/site/$(api_version)/m'} + echo "$as_me:$LINENO: result: defining localapifcnfiledir to be $localapifcnfiledir" >&5 + echo "${ECHO_T}defining localapifcnfiledir to be $localapifcnfiledir" >&6 + +@@ -3327,7 +3327,7 @@ + echo "$as_me:$LINENO: result: defining localoctfiledir to be $localoctfiledir" >&5 + echo "${ECHO_T}defining localoctfiledir to be $localoctfiledir" >&6 + +-: ${localapioctfiledir='$(libexecdir)/octave/site/oct/$(apiversion)/$(canonical_host_type)'} ++: ${localapioctfiledir='$(libexecdir)/octave/site/oct/$(api_version)/$(canonical_host_type)'} + echo "$as_me:$LINENO: result: defining localapioctfiledir to be $localapioctfiledir" >&5 + echo "${ECHO_T}defining localapioctfiledir to be $localapioctfiledir" >&6 + diff --git a/octave.spec b/octave.spec index 4e038e7..c202669 100644 --- a/octave.spec +++ b/octave.spec @@ -1,6 +1,6 @@ Name: octave Version: 2.9.5 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A high-level language for numerical computations Epoch: 6 @@ -8,6 +8,7 @@ Group: Applications/Engineering License: GPL Source: ftp://ftp.octave.org/pub/octave/bleeding-edge/octave-%{version}.tar.bz2 Patch0: octave-2.9.5-sparse.patch +Patch1: octave-2.9.5-config.patch URL: http://www.octave.org Requires: gnuplot less info texinfo Requires(post): /sbin/install-info @@ -51,6 +52,7 @@ applications which use GNU Octave. %prep %setup -q %patch0 -p0 +%patch1 -p0 %build @@ -133,6 +135,9 @@ fi %changelog +* Wed Apr 19 2006 Quentin Spencer 2.9.5-5 +- Add new patch to configure script (breaks octave-forge without it). + * Fri Mar 24 2006 Quentin Spencer 2.9.5-4 - Change patch again (suggested by the author on Octave mailing list).