From 8e5bec95016987e16d682d9fdb6365411f347997 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@cora.nwra.com>
Date: Aug 12 2011 22:38:40 +0000
Subject: Update to 5.9.8

Drop octave-config patch applied upstream
Add BR mesa-dri-drivers to get swrast_dri.so for tests
Drop converting files to UTF-8, they already are
No longer need the xvfb-run xauth workaround

---

diff --git a/.gitignore b/.gitignore
index 276378e..be81652 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /plplot-5.9.7.tar.gz
+/plplot-5.9.8.tar.gz
diff --git a/plplot.spec b/plplot.spec
index 0334581..d17037f 100644
--- a/plplot.spec
+++ b/plplot.spec
@@ -23,8 +23,8 @@
 %endif
 
 Name:           plplot
-Version:        5.9.7
-Release:        9%{?dist}
+Version:        5.9.8
+Release:        1%{?dist}
 Summary:        Library of functions for making scientific plots
 
 Group:          Applications/Engineering
@@ -33,7 +33,6 @@ URL:            http://plplot.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/plplot/%{name}-%{version}.tar.gz
 Patch0:         plplot-5.9.7-gnat46.patch
 Patch1:         plplot-5.9.7-multiarch.patch
-Patch2:         plplot-octave-config.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  cmake, libtool-ltdl-devel, swig
@@ -79,7 +78,7 @@ BuildRequires:  qt-devel
 #For pyqt4
 BuildRequires:  PyQt4-devel
 #For Qt tests
-BuildRequires:  xorg-x11-xauth, xorg-x11-server-Xvfb
+BuildRequires:  xorg-x11-xauth, xorg-x11-server-Xvfb, mesa-dri-drivers
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 Requires:       gnu-free-mono-fonts
@@ -323,14 +322,6 @@ Requires:       pkgconfig
 %setup -q
 %patch0 -p1 -b .gnat46
 %patch1 -p1 -b .multiarch
-%patch2 -p1 -b .octave-config
-# Convert to UTF-8
-for file in ChangeLog NEWS
-do
-  iconv -f ISO-8859-1 -t UTF-8 $file > ${file}.tmp
-  touch -r $file ${file}.tmp
-  mv ${file}.tmp $file
-done
 
 
 %build
@@ -412,14 +403,11 @@ cd fedora
 export ITCL_LIBRARY=%{_libdir}/tcl8.5/itcl3.4
 # Exclude compare tests for now, and ocaml from ppc/ppc64
 # The *qt tests requires an X server
-XAUTHFILE=`mktemp`
-#Not needed on fedora builders?
-#chcon -t xauth_home_t $XAUTHFILE
 ERRORFILE=`mktemp`
 %ifarch ppc ppc64
-xvfb-run -f $XAUTHFILE -e $ERRORFILE ctest -V -E 'compare|ocaml'
+xvfb-run -e $ERRORFILE ctest -V -E 'compare|ocaml'
 %else
-xvfb-run -f $XAUTHFILE -e $ERRORFILE ctest -V -E 'compare' || (cat $ERRORFILE && exit 1)
+xvfb-run -e $ERRORFILE ctest -V -E 'compare' || (cat $ERRORFILE && exit 1)
 %endif
 
 
@@ -698,6 +686,13 @@ fi
 
 
 %changelog
+* Mon Aug 8 2011 Orion Poplawski <orion@cora.nwra.com> - 5.9.8-1
+- Update to 5.9.8
+- Drop octave-config patch applied upstream
+- Add BR mesa-dri-drivers to get swrast_dri.so for tests
+- Drop converting files to UTF-8, they already are
+- No longer need the xvfb-run xauth workaround
+
 * Tue Apr 5 2011 Orion Poplawski <orion@cora.nwra.com> - 5.9.7-9
 - Add patch to use octave-config to handle moved octave directories
 
diff --git a/sources b/sources
index 8aa4789..670b2e6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c53c484ed93ce8446513c31707551b5b  plplot-5.9.7.tar.gz
+e87328fb299d58a6115e06bfa7757ee9  plplot-5.9.8.tar.gz