[plplot] Add patch to allow octave tests to be run in mock

[Orion Poplawski]

commit cf0a1f9d44079195d4fe1000efeabe623f2ef2cc
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Mon Jan 16 08:32:33 2012 -0700

    Add patch to allow octave tests to be run in mock

 plplot-octave.patch |   12 ++++++++++++
 plplot.spec         |    5 +++++
 2 files changed, 17 insertions(+), 0 deletions(-)
---
diff --git a/plplot-octave.patch b/plplot-octave.patch
new file mode 100644
index 0000000..f21b4d2
--- /dev/null
+++ b/plplot-octave.patch
@@ -0,0 +1,12 @@
+diff -up plplot-5.9.9/plplot_test/test_octave.sh.in.octave plplot-5.9.9/plplot_test/test_octave.sh.in
+--- plplot-5.9.9/plplot_test/test_octave.sh.in.octave	2011-10-12 18:43:01.000000000 -0600
++++ plplot-5.9.9/plplot_test/test_octave.sh.in	2012-01-16 08:29:46.551852247 -0700
+@@ -35,7 +35,7 @@ echo "$TOPDIR"
+ export LD_LIBRARY_PATH="$TOPDIR"/src:"$TOPDIR"/lib/csa:"$TOPDIR"/lib/nn
+ 
+ # Launch an Octave script that exercises all the demos
+-$octave -f -q -p "$octavedir" <<EOF 2> test.error
++$octave -f -q $octaveopts -p "$octavedir" <<EOF 2> test.error
+ 
+ # Check verbose_test variable
+ if (strcmp(getenv("verbose_test"),"on") == 1)
diff --git a/plplot.spec b/plplot.spec
index 6ad2119..5832805 100644
--- a/plplot.spec
+++ b/plplot.spec
@@ -32,6 +32,8 @@ License:        LGPLv2+
 URL:            http://plplot.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/plplot/%{name}-%{version}.tar.gz
 Patch0:         plplot-svn12123.patch
+# Add patch to pass octaveopts to octave tests
+Patch1:         plplot-octave.patch
 Patch2:         plplot-multiarch.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -321,6 +323,7 @@ Requires:       pkgconfig
 %prep
 %setup -q
 %patch0 -p1 -b .svn
+%patch1 -p1 -b .octave
 %patch2 -p1 -b .multiarch
 
 
@@ -398,6 +401,7 @@ mv %{buildroot}%{_libdir}/fortran/include/plplot/plplot_parameters.h %{buildroot
 
 %check
 cd fedora
+export octaveopts=--no-window-system
 #Hack
 export ITCL_LIBRARY=%{_libdir}/tcl8.5/itcl3.4
 # Exclude compare tests for now, and ocaml from ppc/ppc64
@@ -691,6 +695,7 @@ fi
 %changelog
 * Mon Jan 16 2012 Orion Poplawski <orion at cora.nwra.com> - 5.9.9-4.svn12123
 - Rebuild for octave 3.6.0
+- Add patch to allow octave tests to be run in mock
 
 * Fri Jan 13 2012 Orion Poplawski <orion at cora.nwra.com> - 5.9.9-3.svn12123
 - Drop unneeded gnome BRs