rpms/octave-forge/FC-4 octave-forge.spec,1.28,1.29

[Quentin Spencer (qspencer)]

Author: qspencer

Update of /cvs/extras/rpms/octave-forge/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13794

Modified Files:
	octave-forge.spec 
Log Message:
Rebuild for octave 2.9.8. A few bug fixes.


Index: octave-forge.spec
===================================================================
RCS file: /cvs/extras/rpms/octave-forge/FC-4/octave-forge.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- octave-forge.spec	30 Jul 2006 03:58:56 -0000	1.28
+++ octave-forge.spec	25 Aug 2006 17:09:41 -0000	1.29
@@ -1,6 +1,6 @@
 Name:           octave-forge
 Version:        2006.07.09
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Contributed functions for octave
 
 Group:          Applications/Engineering
@@ -16,9 +16,11 @@
 ## rm -Rf octave-forge-%{version}
 Source0:        %{name}-%{version}.patched.tar.gz
 Patch0:         octave-forge-2006.07.09-legend.patch
+Patch1:         octave-forge-2006.07.09-imread.patch
+Patch2:         octave-forge-2006.07.09-path.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires:	octave >= 2.9.7 ImageMagick
+Requires:	octave >= 2.9.8 ImageMagick
 BuildRequires:  octave-devel tetex gcc-gfortran ginac-devel qhull-devel
 BuildRequires:  ImageMagick-c++-devel libnc-dap-devel pcre-devel gsl-devel
 BuildRequires:  libjpeg-devel libpng-devel ncurses-devel libtermcap-devel
@@ -34,11 +36,16 @@
 %prep
 %setup -q
 %patch0 -p0
-# For octave >= 2.9.7, don't install the mex stuff
+%patch1 -p0
+%patch2 -p0
+# For octave >= 2.9.7, don't install the mex stuff or path stuff
 touch extra/mex/NOINSTALL
+touch main/path/NOINSTALL
 
 %build
-%configure
+ALTMPATHNAME=%{_datadir}/octave/site/octave-forge-alternatives/m/octave-forge
+XPATHNAME=`octave-config -p LOCALARCHLIBDIR`/octave-forge
+%configure --with-altmpath=$ALTMPATHNAME --with-xpath=$XPATHNAME
 make %{?_smp_mflags}
 
 %install
@@ -66,6 +73,13 @@
 
 
 %changelog
+* Fri Aug 25 2006 Quentin Spencer <qspencer at users.sf.net> 2006.07.09-4
+- New build for octave 2.9.8.
+- Patch bug in imread.m
+- Patch LOADPATH bug.
+- Fix configure command so that m files containing paths are
+  correctly generated.
+
 * Sat Jul 29 2006 Quentin Spencer <qspencer at users.sf.net> 2006.07.09-3
 - New build for octave 2.9.7.
 - Disable mex related functions (they are in octave now).