rpms/octave-forge/devel octave-forge-2006.07.09-imread.patch, NONE, 1.1 octave-forge-2006.07.09-path.patch, NONE, 1.1 octave-forge.spec, 1.27, 1.28

[Quentin Spencer (qspencer)]

Author: qspencer

Update of /cvs/extras/rpms/octave-forge/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31174

Modified Files:
	octave-forge.spec 
Added Files:
	octave-forge-2006.07.09-imread.patch 
	octave-forge-2006.07.09-path.patch 
Log Message:
Several minor bug fixes.

octave-forge-2006.07.09-imread.patch:

--- NEW FILE octave-forge-2006.07.09-imread.patch ---
Index: main/image/imread.m
===================================================================
RCS file: /cvsroot/octave/octave-forge/main/image/imread.m,v
retrieving revision 1.22
retrieving revision 1.21
diff -u -r1.22 -r1.21
--- main/image/imread.m 12 May 2006 13:25:45 -0000      1.21
+++ main/image/imread.m 17 Jul 2006 18:25:13 -0000      1.22
@@ -38,7 +38,7 @@
        error("imread: filename must be a string")
     endif

+    fn = file_in_path(IMAGE_PATH, filename);
-    fn = file_in_path(IMAGEPATH, filename);
     if isempty(fn)
        error("imread: cannot find %s", filename);
     endif

octave-forge-2006.07.09-path.patch:

--- NEW FILE octave-forge-2006.07.09-path.patch ---
Index: extra/graceplot/toggle_grace_use.m
===================================================================
RCS file: /cvsroot/octave/octave-forge/extra/graceplot/toggle_grace_use.m,v
retrieving revision 1.8
diff -u -r1.8 toggle_grace_use.m
--- extra/graceplot/toggle_grace_use.m	14 Apr 2006 12:51:14 -0000	1.8
+++ extra/graceplot/toggle_grace_use.m	24 Aug 2006 14:45:58 -0000
@@ -19,8 +19,8 @@
 ## Use this script to activate/deactivate the default library for the
 ## 2D plotting functions (plot, errorbar, etc.), as both the native
 ## gnuplot and the Grace interface use similar names to the
-## functions. toggle_grace_use post-/pre-pends to LOADPATH the path for
-## the Grace functions in successive calls.
+## functions. toggle_grace_use adds or removes the path to the Grace
+## functions to the system path.
 
 1;
 
@@ -45,17 +45,11 @@
 endif
 
 use_grace_path = grace_octave_path;
-use_grace_i = findstr (LOADPATH, use_grace_path);
-if (!isempty (use_grace_i))
-  LOADPATH (use_grace_i(1):use_grace_i(1)+length(use_grace_path)-1)= "";
-  LOADPATH = strrep (LOADPATH, "::", ":");
-endif
-
 if (strcmp (use_grace_state, "on"))
-  LOADPATH = [use_grace_path, ":", LOADPATH];
+  addpath(use_grace_path);
   __grinit__();
 elseif (strcmp (use_grace_state, "off"))
-  LOADPATH = [LOADPATH, ":", use_grace_path];
+  rmpath(use_grace_path);
   __grexit__();
 endif
 
diff -u octave-forge-2006.07.09.orig/main/miscellaneous/slurp_file.m octave-forge-2006.07.09/main/miscellaneous/slurp_file.m
--- main/miscellaneous/slurp_file.m	2006-03-22 11:50:47.000000000 -0600
+++ main/miscellaneous/slurp_file.m	2006-08-24 10:19:25.000000000 -0500
@@ -29,7 +29,7 @@
 f0 = f;
 [st,err,msg] = stat (f);
 if err && f(1) != "/", 
-  f = file_in_path (LOADPATH, f);
+  f = file_in_loadpath (f);
 				# Could not find it anywhere. Open will
 				# fail.
   if isempty (f)


Index: octave-forge.spec
===================================================================
RCS file: /cvs/extras/rpms/octave-forge/devel/octave-forge.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- octave-forge.spec	28 Jul 2006 22:17:49 -0000	1.27
+++ octave-forge.spec	24 Aug 2006 15:26:17 -0000	1.28
@@ -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,6 +16,8 @@
 ## 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
@@ -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,12 @@
 
 
 %changelog
+* Thu Aug 24 2006 Quentin Spencer <qspencer at users.sf.net> 2006.07.09-4
+- Patch bug in imread.m
+- Patch LOADPATH bug.
+- Fix configure command so that m files containing paths are
+  correctly generated.
+
 * Tue Jul 11 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).