rpms/plplot/devel plplot-5.6.1-octave.patch,1.2,1.3

[Orion Poplawski (orion)]

Author: orion

Update of /cvs/extras/rpms/plplot/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15165

Modified Files:
	plplot-5.6.1-octave.patch 
Log Message:
Restore original octave patch


plplot-5.6.1-octave.patch:

Index: plplot-5.6.1-octave.patch
===================================================================
RCS file: /cvs/extras/rpms/plplot/devel/plplot-5.6.1-octave.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- plplot-5.6.1-octave.patch	2 Nov 2006 16:30:59 -0000	1.2
+++ plplot-5.6.1-octave.patch	2 Nov 2006 16:56:33 -0000	1.3
@@ -67,6 +67,39 @@
  
  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 @@
@@ -158,3 +191,23 @@
  
    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