rpms/octave/FC-5 octave-2.9.5-config.patch, NONE, 1.1 octave.spec, 1.33, 1.34

Quentin Spencer (qspencer) fedora-extras-commits at redhat.com
Thu Apr 20 13:37:44 UTC 2006


Author: qspencer

Update of /cvs/extras/rpms/octave/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8038

Modified Files:
	octave.spec 
Added Files:
	octave-2.9.5-config.patch 
Log Message:
Upgrade to 2.9.5 release, add some needed patches, and lots of spec file improvements.

octave-2.9.5-config.patch:

--- NEW FILE octave-2.9.5-config.patch ---
--- 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
 


Index: octave.spec
===================================================================
RCS file: /cvs/extras/rpms/octave/FC-5/octave.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- octave.spec	23 Mar 2006 22:43:54 -0000	1.33
+++ octave.spec	20 Apr 2006 13:37:44 -0000	1.34
@@ -8,6 +8,7 @@
 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 @@
 %prep
 %setup -q
 %patch0 -p0
+%patch1 -p0
 
 
 %build
@@ -133,8 +135,9 @@
 
 
 %changelog
-* Thu Mar 23 2006 Quentin Spencer <qspencer at users.sourceforge.net> 2.9.5-1
+* Thu Apr 20 2006 Quentin Spencer <qspencer at users.sourceforge.net> 2.9.5-1
 - New upstream release; remove old patches; add sparse patch.
+- Add patch for configure script.
 - Add gcc-c++ as dependency for devel package.
 - Add more docs; cleanup extra files in docs.
 - Simplify configure command.




More information about the scm-commits mailing list