[plplot/f16] Fix FTBFS.

Wed Aug 17 18:38:56 UTC 2011

commit 809db7dbd4314c62b58e7198dbb12f8ea26e32b3
Author: Jussi Lehtola <jussilehtola at fedoraproject.org>
Date:   Wed Aug 17 21:38:43 2011 +0300

    Fix FTBFS.

 plplot.spec |   78 +++++++++++++++++++++++++++++++---------------------------
 sources     |    2 +-
 2 files changed, 43 insertions(+), 37 deletions(-)
---

diff --git a/plplot.spec b/plplot.spec
index 0334581..f635085 100644
--- a/plplot.spec
+++ b/plplot.spec
@@ -6,7 +6,7 @@
 %bcond_without octave
 # Set to bcond_with or use --without pdl to disable pdl tests - needed to 
 # bootstrap or for soname bumps in a plplot dependency
-%bcond_without pdl
+%bcond_with pdl
 
 # conditionalize Ada support
 %ifarch %{sparc} s390 s390x
@@ -23,8 +23,8 @@
 %endif
 
 Name:           plplot
-Version:        5.9.7
-Release:        9%{?dist}
+Version:        5.9.8
+Release:        2%{?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
@@ -239,14 +238,16 @@ Requires:       octave(api) = %{octave_api}
 %endif
 
 
-%if %{with pdl}
 %package        perl
 Summary:        Examples for using plplot with PDL
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 
 %description    perl
+%if %{with pdl}
 %{summary}.
+%else
+This is a dummy package, since pdl support was not enabled in the plplot build.
 %endif
 
 
@@ -323,14 +324,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
@@ -405,6 +398,9 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/plplot%{version}/examples/cmake/modules/Platfo
 #Don't pull in script interpreters for example binaries
 chmod -x $RPM_BUILD_ROOT%{_datadir}/plplot%{version}/examples/tk/tk*
 
+# Place Fortran include file in a more appropriate location
+mkdir -p %{buildroot}%{_includedir}
+mv %{buildroot}%{_libdir}/fortran/include/plplot/plplot_parameters.h %{buildroot}%{_includedir}/
 
 %check
 cd fedora
@@ -412,14 +408,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`
+LOGFILE=`mktemp`
 %ifarch ppc ppc64
-xvfb-run -f $XAUTHFILE -e $ERRORFILE ctest -V -E 'compare|ocaml'
+ctest -V -E 'compare|ocaml|qt' &> $LOGFILE
 %else
-xvfb-run -f $XAUTHFILE -e $ERRORFILE ctest -V -E 'compare' || (cat $ERRORFILE && exit 1)
+ctest -V -E 'compare|qt' &> $LOGFILE || (cat $LOGFILE && exit 1)
 %endif
 
 
@@ -496,26 +489,26 @@ fi
 %{_libdir}/libqsastime.so.*
 %dir %{_libdir}/plplot%{version}
 %dir %{_libdir}/plplot%{version}/driversd
-%{_libdir}/plplot%{version}/driversd/cairo.rc
 %{_libdir}/plplot%{version}/driversd/cairo.so
-%{_libdir}/plplot%{version}/driversd/mem.rc
+%{_libdir}/plplot%{version}/driversd/cairo.driver_info
 %{_libdir}/plplot%{version}/driversd/mem.so
-%{_libdir}/plplot%{version}/driversd/ntk.rc
+%{_libdir}/plplot%{version}/driversd/mem.driver_info
 %{_libdir}/plplot%{version}/driversd/ntk.so
-%{_libdir}/plplot%{version}/driversd/null.rc
+%{_libdir}/plplot%{version}/driversd/ntk.driver_info
 %{_libdir}/plplot%{version}/driversd/null.so
-%{_libdir}/plplot%{version}/driversd/ps.rc
+%{_libdir}/plplot%{version}/driversd/null.driver_info
 %{_libdir}/plplot%{version}/driversd/ps.so
-%{_libdir}/plplot%{version}/driversd/pstex.rc
+%{_libdir}/plplot%{version}/driversd/ps.driver_info
 %{_libdir}/plplot%{version}/driversd/pstex.so
-%{_libdir}/plplot%{version}/driversd/psttf.rc
+%{_libdir}/plplot%{version}/driversd/pstex.driver_info
 %{_libdir}/plplot%{version}/driversd/psttf.so
-%{_libdir}/plplot%{version}/driversd/svg.rc
+%{_libdir}/plplot%{version}/driversd/psttf.driver_info
 %{_libdir}/plplot%{version}/driversd/svg.so
-%{_libdir}/plplot%{version}/driversd/xfig.rc
+%{_libdir}/plplot%{version}/driversd/svg.driver_info
 %{_libdir}/plplot%{version}/driversd/xfig.so
-%{_libdir}/plplot%{version}/driversd/xwin.rc
+%{_libdir}/plplot%{version}/driversd/xfig.driver_info
 %{_libdir}/plplot%{version}/driversd/xwin.so
+%{_libdir}/plplot%{version}/driversd/xwin.driver_info
 
 %files devel
 %defattr(-,root,root,-)
@@ -577,6 +570,7 @@ fi
 %{_libdir}/libplplotf77d.so
 %{_libdir}/libplplotf95cd.so
 %{_libdir}/libplplotf95d.so
+%{_includedir}/plplot_parameters.h
 %{_libdir}/pkgconfig/plplotd-f77.pc
 %{_libdir}/pkgconfig/plplotd-f95.pc
 %{_datadir}/plplot%{version}/examples/f77/
@@ -631,16 +625,17 @@ fi
 %defattr(-,root,root,-)
 %{_datadir}/plplot_octave/
 %{_datadir}/octave/site/m/PLplot/
-%{_libexecdir}/octave/site/oct/*/plplot_octave.oct
+%{_libdir}/octave/site/oct/%{_target_platform}/plplot_octave.oct
 %{_datadir}/plplot%{version}/examples/lena.img
 %{_datadir}/plplot%{version}/examples/octave/
 %{_datadir}/plplot%{version}/examples/test_octave.sh
 %{_datadir}/plplot%{version}/examples/test_octave_interactive.sh
 %endif
 
-%if %{with pdl}
+#%if %{with pdl}
 %files perl
 %defattr(-,root,root,-)
+%if %{with pdl}
 %{_datadir}/plplot%{version}/examples/perl/
 %{_datadir}/plplot%{version}/examples/test_pdl.sh
 %endif
@@ -652,8 +647,8 @@ fi
 %files qt
 %defattr(-,root,root,-)
 %{_libdir}/libplplotqtd.so.*
-%{_libdir}/plplot%{version}/driversd/qt.rc
 %{_libdir}/plplot%{version}/driversd/qt.so
+%{_libdir}/plplot%{version}/driversd/qt.driver_info
 
 %files qt-devel
 %defattr(-,root,root,-)
@@ -666,10 +661,10 @@ fi
 %{_bindir}/pltcl
 %{_libdir}/libplplottcltkd.so.*
 %{_libdir}/libtclmatrixd.so.*
-%{_libdir}/plplot%{version}/driversd/tk.rc
 %{_libdir}/plplot%{version}/driversd/tk.so
-%{_libdir}/plplot%{version}/driversd/tkwin.rc
+%{_libdir}/plplot%{version}/driversd/tk.driver_info
 %{_libdir}/plplot%{version}/driversd/tkwin.so
+%{_libdir}/plplot%{version}/driversd/tkwin.driver_info
 %{python_sitearch}/plplot_widgetmodule.so
 %{_datadir}/plplot%{version}/pkgIndex.tcl
 %{_datadir}/plplot%{version}/examples/test_tcl.sh
@@ -688,8 +683,8 @@ fi
 %files wxGTK
 %defattr(-,root,root,-)
 %{_libdir}/libplplotwxwidgetsd.so.*
-%{_libdir}/plplot%{version}/driversd/wxwidgets.rc
 %{_libdir}/plplot%{version}/driversd/wxwidgets.so
+%{_libdir}/plplot%{version}/driversd/wxwidgets.driver_info
 
 %files wxGTK-devel
 %defattr(-,root,root,-)
@@ -698,6 +693,17 @@ fi
 
 
 %changelog
+* Wed Aug 17 2011 Jussi Lehtola <jussilehtola at fedoraproject.org> - 5.9.8-2
+- Fix FTBFS (gah).
+- Drop pdl support for now, since it isn't used anyways by plplot.
+
+* Mon Aug 8 2011 Orion Poplawski <orion at 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 at 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
