rpms/plplot/devel plplot-5.6.1-octave.patch, NONE, 1.1 plplot.spec, 1.14, 1.15
Orion Poplawski (orion)
fedora-extras-commits at redhat.com
Mon Aug 7 21:39:24 UTC 2006
Author: orion
Update of /cvs/extras/rpms/plplot/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24766/devel
Modified Files:
plplot.spec
Added Files:
plplot-5.6.1-octave.patch
Log Message:
Add patch to support octave 2.9.7 (bug #201443)
plplot-5.6.1-octave.patch:
--- NEW FILE plplot-5.6.1-octave.patch ---
Index: plplot/bindings/octave/PLplot/plplot_octave_path.m.in
===================================================================
RCS file: /cvsroot/plplot/plplot/bindings/octave/PLplot/plplot_octave_path.m.in,v
retrieving revision 1.8
diff -u -r1.8 plplot_octave_path.m.in
--- plplot/bindings/octave/PLplot/plplot_octave_path.m.in 25 Jan 2004 22:17:07 -0000 1.8
+++ plplot/bindings/octave/PLplot/plplot_octave_path.m.in 7 Aug 2006 16:37:05 -0000
@@ -22,17 +22,12 @@
global __pl_plplot_octave_path
if (!exist("__pl_plplot_octave_path") || isempty(__pl_plplot_octave_path))
- __pl_plplot_octave_path = "@PLPLOT_OCTAVE_DIR@//";
+ __pl_plplot_octave_path = "@PLPLOT_OCTAVE_DIR@";
endif
if (nargin == 0)
path = __pl_plplot_octave_path;
elseif (nargin == 1 && isstr(path))
- if (path(length (path)) != '/')
- path = [path "//"];
- elseif (path(length (path)-1) != '/')
- path = [path "/"];
- endif
__pl_plplot_octave_path = path;
else
help plplot_octave_path
Index: plplot/bindings/octave/PLplot/toggle_plplot_use.m
===================================================================
RCS file: /cvsroot/plplot/plplot/bindings/octave/PLplot/toggle_plplot_use.m,v
retrieving revision 1.6
diff -u -r1.6 toggle_plplot_use.m
--- plplot/bindings/octave/PLplot/toggle_plplot_use.m 25 Jan 2004 22:21:36 -0000 1.6
+++ plplot/bindings/octave/PLplot/toggle_plplot_use.m 7 Aug 2006 16:37:05 -0000
@@ -31,28 +31,24 @@
endif
endif
-use_plplot_path = plplot_octave_path;
-use_plplot_i = findstr (LOADPATH, use_plplot_path);
-if (!isempty (use_plplot_i))
- LOADPATH (use_plplot_i(1):use_plplot_i(1)+length(use_plplot_path)-1)= "";
- LOADPATH = strrep (LOADPATH, "::", ":");
-endif
-
+if (!isempty(findstr(path, plplot_octave_path)))
+ rmpath (genpath(plplot_octave_path));
+endif
if (strcmp (use_plplot_state, "on"))
- LOADPATH = [use_plplot_path, ":", LOADPATH];
+ addpath(genpath(plplot_octave_path),"-begin");
plplot_stub;
elseif (strcmp (use_plplot_state, "off"))
- LOADPATH = [LOADPATH, ":", use_plplot_path];
+ addpath(genpath(plplot_octave_path),"-end");
endif
use_plplot_lcd = pwd;
-cd (use_plplot_path);
+cd (plplot_octave_path);
for use_plplot_i = [ char(glob("*.m ")); char(glob("support/*.m ")) ]'
clear (strrep (strrep (deblank(use_plplot_i'), ".m", ""), "support/", ""));
end
cd (use_plplot_lcd);
-clear use_plplot_path use_plplot_lcd use_plplot_i
+clear use_plplot_lcd use_plplot_i
printf ("Use PLplot: %s\n", use_plplot_state);
Index: plplot/test/plplot-test.sh.in
===================================================================
RCS file: /cvsroot/plplot/plplot/test/plplot-test.sh.in,v
retrieving revision 1.37
diff -u -r1.37 plplot-test.sh.in
--- plplot/test/plplot-test.sh.in 27 Jul 2006 21:55:35 -0000 1.37
+++ plplot/test/plplot-test.sh.in 7 Aug 2006 17:45:44 -0000
@@ -146,7 +146,7 @@
perldir=$SRC_EXAMPLES_DIR/perl
javadir=$EXAMPLES_DIR/java
octave=@OCTAVE@
-octavedir=$SRC_EXAMPLES_DIR/../bindings/octave//:$SRC_EXAMPLES_DIR/octave//:@PLPLOT_OCTAVE_DIR@//:@OCTAVE_M_DIR@//:@OCTAVE_OCT_DIR@//:
+octavedir=$SRC_EXAMPLES_DIR/../bindings/octave
PATH=$EXAMPLES_DIR/../utils:@exec_prefix@/bin:$PATH
export cdir cxxdir f77dir f95dir pythondir javadir octave octavedir tcldir perldir PATH
Index: plplot/test/test_octave.sh.in
===================================================================
RCS file: /cvsroot/plplot/plplot/test/test_octave.sh.in,v
retrieving revision 1.4
diff -u -r1.4 test_octave.sh.in
--- plplot/test/test_octave.sh.in 26 Apr 2006 14:36:02 -0000 1.4
+++ plplot/test/test_octave.sh.in 7 Aug 2006 17:45:44 -0000
@@ -30,7 +30,8 @@
export LD_LIBRARY_PATH=$TOPDIR/src/.libs:$TOPDIR/lib/csa/.libs:$TOPDIR/lib/nn/.libs
# Launch an Octave script that exercises all the demos
-$octave -f -q -p $octavedir <<EOF
+$octave -f -q <<EOF
+addpath(genpath("$octavedir"));
plplot_stub;
t = split("$options", "-"); t(1,:)="";
for i=1:rows(t)
--- plplot-5.6.1/bindings/octave/PLplot/shade.m.octave 2004-06-14 15:51:51.000000000 -0600
+++ plplot-5.6.1/bindings/octave/PLplot/shade.m 2006-08-07 14:03:03.000000000 -0600
@@ -26,11 +26,11 @@
global __pl
strm = __pl_init;
- old_empty_list_elements_ok = warn_empty_list_elements;
+ old_empty_list_elements_ok = warning("query","Octave:empty-list-elements").state;
unwind_protect
- warn_empty_list_elements = 0;
+ warning("off", "Octave:empty-list-elements");
if (nargin == 1 && is_matrix(x))
levels = 20;
@@ -173,7 +173,7 @@
unwind_protect_cleanup
- warn_empty_list_elements = old_empty_list_elements_ok;
+ warning(old_empty_list_elements_ok,"Octave:empty-list-elements");
end_unwind_protect
--- plplot-5.6.1/bindings/octave/PLplot/support/__pl_contour.m.octave 2004-06-14 15:51:51.000000000 -0600
+++ plplot-5.6.1/bindings/octave/PLplot/support/__pl_contour.m 2006-08-07 14:03:34.000000000 -0600
@@ -19,11 +19,11 @@
strm = plgstrm+1;
- old_empty_list_elements_ok = warn_empty_list_elements;
+ old_empty_list_elements_ok = warning("query","Octave:empty_list_elements").state;
unwind_protect
- warn_empty_list_elements = 0;
+ warning("off","Octave:empty-list-elements") = 0;
grid = 0;
if (__pl.grid(strm))
@@ -113,7 +113,7 @@
unwind_protect_cleanup
- warn_empty_list_elements = old_empty_list_elements_ok;
+ warning(old_empty_list_elements_ok,"Octave:empty_list_elements");
end_unwind_protect
--- plplot-5.6.1/bindings/octave/PLplot/support/__pl_matstr.m.octave 2004-06-14 15:51:51.000000000 -0600
+++ plplot-5.6.1/bindings/octave/PLplot/support/__pl_matstr.m 2006-08-07 14:03:56.000000000 -0600
@@ -35,10 +35,10 @@
out(nn,:) = "";
endif
endif
- old_dofi = warn_fortran_indexing;
- warn_fortran_indexing = 0;
+ old_dofi = warning("query","Octave:fortran-indexing").state;
+ warning("off","Octave:fortran-indexing");
out(toascii (out) == 0) = " ";
- warn_fortran_indexing = old_dofi;
+ warning(old_dofi,"Octave:fortran-indexing");
else
help __pl_matstr
endif
--- plplot-5.6.1/bindings/octave/PLplot/support/__pl_plotit.m.octave 2004-06-14 15:51:51.000000000 -0600
+++ plplot-5.6.1/bindings/octave/PLplot/support/__pl_plotit.m 2006-08-07 14:04:31.000000000 -0600
@@ -26,11 +26,11 @@
return
endif
- old_empty_list_elements_ok = warn_empty_list_elements;
+ old_empty_list_elements_ok = warning("query","Octave:empty-list-elements").state;
unwind_protect
- warn_empty_list_elements = 0;
+ warning("off","Octave:empty-list-elements");
if (__pl.type(strm) >= 100 && __pl.type(strm) < 200)
__pl_meshplotit;
@@ -282,7 +282,7 @@
unwind_protect_cleanup
- warn_empty_list_elements = old_empty_list_elements_ok;
+ warning(old_empty_list_elements_ok,"Octave:empty-list-elements");
end_unwind_protect
--- plplot-5.6.1/configure.octave 2006-08-07 14:07:47.000000000 -0600
+++ plplot-5.6.1/configure 2006-08-07 14:08:33.000000000 -0600
@@ -22006,7 +22006,7 @@
echo "$as_me:$LINENO: checking Octave m dir" >&5
echo $ECHO_N "checking Octave m dir... $ECHO_C" >&6
- if test -n "`echo $OCTAVE_VERSION | sed 's/^2.1//p;d;q'`" ; then
+ if test -n "`echo $OCTAVE_VERSION | sed 's/^2.[19]//p;d;q'`" ; then
# Octave version 2.1
OCTAVE_M_DIR=`$OCTAVE -q -f <<EOF
@@ -22033,7 +22033,7 @@
echo "$as_me:$LINENO: checking Octave oct dir" >&5
echo $ECHO_N "checking Octave oct dir... $ECHO_C" >&6
- if test -n "`echo $OCTAVE_VERSION | sed 's/^2.1//p;d;q'`" ; then
+ if test -n "`echo $OCTAVE_VERSION | sed 's/^2.[19]//p;d;q'`" ; then
# Octave version 2.1
OCTAVE_OCT_DIR=`$OCTAVE -q -f <<EOF
Index: plplot.spec
===================================================================
RCS file: /cvs/extras/rpms/plplot/devel/plplot.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- plplot.spec 31 May 2006 20:23:03 -0000 1.14
+++ plplot.spec 7 Aug 2006 21:39:24 -0000 1.15
@@ -2,7 +2,7 @@
Name: plplot
Version: 5.6.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Library of functions for making scientific plots
Group: Applications/Engineering
@@ -10,6 +10,7 @@
URL: http://plplot.sourceforge.net/
Source0: http://prdownloads.sf.net/plplot/%{name}-%{version}.tar.gz
Patch0: plplot-5.5.3-matwrap.patch
+Patch1: plplot-5.6.1-octave.patch
Patch6: plplot-5.6.0-x.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -139,6 +140,7 @@
%prep
%setup -q
%patch0 -p1 -b .orig
+%patch1 -p1 -b .octave
%patch6 -p1 -b .orig
@@ -347,6 +349,9 @@
%changelog
+* Mon Aug 7 2006 - Orion Poplawski <orion at cora.nwra.com> - 5.6.1-2
+- Add patch to support octave 2.9.7 (bug #201443)
+
* Mon May 22 2006 - Orion Poplawski <orion at cora.nwra.com> - 5.6.1-1
- Update to 5.6.1
- Enable f95 bindings
More information about the fedora-extras-commits
mailing list