diff --git a/.cvsignore b/.cvsignore index d71d119..93e0e02 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -plplot-5.9.4.tar.gz +plplot-5.9.5.tar.gz diff --git a/plplot.spec b/plplot.spec index a05bbbc..d750189 100644 --- a/plplot.spec +++ b/plplot.spec @@ -9,8 +9,8 @@ %bcond_without pdl Name: plplot -Version: 5.9.4 -Release: 8%{?dist} +Version: 5.9.5 +Release: 1%{?dist} Summary: Library of functions for making scientific plots Group: Applications/Engineering @@ -21,7 +21,7 @@ Patch1: plplot-5.9.3-multiarch.patch Patch2: plplot-5.9.2-info.patch Patch3: plplot-5.9.4-octave32.patch Patch4: plplot-5.9.4-transform_version.patch -Patch5: plplot-5.9.3-test.patch +Patch5: plplot-5.9.5-test.patch Patch6: plplot-5.7.3-jni.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -59,6 +59,11 @@ BuildRequires: texlive, texinfo, openjade, jadetex, docbook2X, docbook-style-ds BuildRequires: ocaml, ocaml-findlib, ocaml-camlidl-devel %endif BuildRequires: lua-devel +BuildRequires: qt-devel +#For pyqt4 +BuildRequires: PyQt4-devel +#For Qt tests +BuildRequires: xorg-x11-xauth, xorg-x11-server-Xvfb Requires(post): /sbin/install-info Requires(preun): /sbin/install-info Requires: gnu-free-mono-fonts @@ -258,8 +263,8 @@ Requires: pkgconfig %setup -q %patch1 -p1 -b .multiarch %patch2 -p1 -b .info -%patch3 -p1 -b .octave32 -%patch4 -p1 -b .transform_version +#%patch3 -p1 -b .octave32 +#patch4 -p1 -b .transform_version %patch5 -p1 -b .test %patch6 -p1 -b .jni # Convert to UTF-8 @@ -279,50 +284,49 @@ export CXXFLAGS="$RPM_OPT_FLAGS" export FFLAGS="$RPM_OPT_FLAGS" #Needed for octave output to not have control characters unset TERM +printenv %cmake .. \ - -DCMAKE_SKIP_RPATH:BOOL=OFF \ - -DCMAKE_Fortran_COMPILER:FILEPATH=%{_bindir}/gfortran \ - -DUSE_RPATH:BOOL=OFF \ + -DCMAKE_SKIP_RPATH:BOOL=OFF \ + -DCMAKE_Fortran_COMPILER:FILEPATH=%{_bindir}/gfortran \ + -DUSE_RPATH:BOOL=OFF \ -DENABLE_ada:BOOL=ON \ -DHAVE_ADA_2007:BOOL=ON \ - -DENABLE_d:BOOL=ON \ - -DENABLE_itcl:BOOL=ON \ - -DENABLE_itk:BOOL=ON \ - -DENABLE_lua:BOOL=ON \ - -DHAVE_lua51:BOOL=ON \ - -DENABLE_ocaml:BOOL=ON \ - -DOCAML_INSTALL_DIR:PATH=`ocamlc -where` \ - %{build_octave} \ - -DENABLE_pdl:BOOL=ON \ - -DENABLE_tk:BOOL=ON \ - -DHAVE_PTHREAD:BOOL=ON \ - -DPL_FREETYPE_FONT_PATH:PATH="/usr/share/fonts/gnu-free" \ - -DPLD_aqt:BOOL=ON \ - -DPLD_conex:BOOL=ON \ - -DPLD_dg300:BOOL=ON \ - -DPLD_imp:BOOL=ON \ - -DPLD_linuxvga:BOOL=ON \ - -DPLD_ljii:BOOL=ON \ - -DPLD_ljiip:BOOL=ON \ - -DPLD_mskermit:BOOL=ON \ - -DPLD_ntk:BOOL=ON \ - -DPLD_pstex:BOOL=ON \ - -DPLD_svg:BOOL=ON \ - -DPLD_tek4010:BOOL=ON \ - -DPLD_tek4010f:BOOL=ON \ - -DPLD_tek4107:BOOL=ON \ - -DPLD_tek4107f:BOOL=ON \ - -DPLD_versaterm:BOOL=ON \ - -DPLD_vlt:BOOL=ON \ - -DPLD_xterm:BOOL=ON \ - -DPLD_wxwidgets:BOOL=ON \ + -DENABLE_d:BOOL=ON \ + -DENABLE_itcl:BOOL=ON \ + -DENABLE_itk:BOOL=ON \ + -DENABLE_lua:BOOL=ON \ + -DHAVE_lua51:BOOL=ON \ + -DENABLE_ocaml:BOOL=ON \ + -DOCAML_INSTALL_DIR:PATH=`ocamlc -where` \ + %{build_octave} \ + -DENABLE_pdl:BOOL=ON \ + -DENABLE_tk:BOOL=ON \ + -DHAVE_PDL_GRAPHICS_PLPLOT_40:BOOL=ON \ + -DHAVE_PTHREAD:BOOL=ON \ + -DPL_FREETYPE_FONT_PATH:PATH="/usr/share/fonts/gnu-free" \ + -DPLD_aqt:BOOL=ON \ + -DPLD_conex:BOOL=ON \ + -DPLD_imp:BOOL=ON \ + -DPLD_linuxvga:BOOL=ON \ + -DPLD_mskermit:BOOL=ON \ + -DPLD_ntk:BOOL=ON \ + -DPLD_pstex:BOOL=ON \ + -DPLD_svg:BOOL=ON \ + -DPLD_tek4010:BOOL=ON \ + -DPLD_tek4010f:BOOL=ON \ + -DPLD_tek4107:BOOL=ON \ + -DPLD_tek4107f:BOOL=ON \ + -DPLD_versaterm:BOOL=ON \ + -DPLD_vlt:BOOL=ON \ + -DPLD_xterm:BOOL=ON \ + -DPLD_wxwidgets:BOOL=ON \ %if %{with doc} - -DXML_DECL:FILEPATH=/usr/share/sgml/xml.dcl \ - -DBUILD_DOC:BOOL=ON \ + -DXML_DECL:FILEPATH=/usr/share/sgml/xml.dcl \ + -DBUILD_DOC:BOOL=ON \ %else - -DPREBUILT_DOC:BOOL=ON \ + -DPREBUILT_DOC:BOOL=ON \ %endif - -DBUILD_TEST:BOOL=ON + -DBUILD_TEST:BOOL=ON # --debug-output --debug-trycompile \ # make %{?_smp_flags} VERBOSE=1 @@ -346,11 +350,13 @@ done cd fedora #Hack export ITCL_LIBRARY=%{_libdir}/tcl8.5/itcl3.4 -# Exclude perl and compare tests for now, and ocaml from ppc/ppc64 +# Exclude compare tests for now, and ocaml from ppc/ppc64 +# The *qt tests requires an X server, but Xvfb is segfaulting +# http://bugs.freedesktop.org/show_bug.cgi?id=23815 %ifarch ppc ppc64 -ctest -V -E 'compare|ocaml' +xvfb-run -f `mktemp` -e /dev/stderr ctest -V -E 'compare|ocaml|qt' %else -ctest -V -E 'compare' +xvfb-run -f `mktemp` -e /dev/stderr ctest -V -E 'compare|qt' %endif @@ -413,7 +419,6 @@ fi %defattr(-,root,root,-) %{_libdir}/libcsirocsa.so.* %{_libdir}/libcsironn.so.* -%{_libdir}/libnistcd.so.* %{_libdir}/libplplotcxxd.so.* %{_libdir}/libplplotd.so.* %{_libdir}/libplplotf77cd.so.* @@ -425,30 +430,16 @@ fi %dir %{_libdir}/plplot%{version}/driversd %{_libdir}/plplot%{version}/driversd/cairo.rc %{_libdir}/plplot%{version}/driversd/cairo.so -%{_libdir}/plplot%{version}/driversd/cgm.rc -%{_libdir}/plplot%{version}/driversd/cgm.so -%{_libdir}/plplot%{version}/driversd/dg300.rc -%{_libdir}/plplot%{version}/driversd/dg300.so -%{_libdir}/plplot%{version}/driversd/hpgl.rc -%{_libdir}/plplot%{version}/driversd/hpgl.so -%{_libdir}/plplot%{version}/driversd/impress.rc -%{_libdir}/plplot%{version}/driversd/impress.so %ifarch %{ix86} x86_64 %{_libdir}/plplot%{version}/driversd/linuxvga.rc %{_libdir}/plplot%{version}/driversd/linuxvga.so %endif -%{_libdir}/plplot%{version}/driversd/ljii.rc -%{_libdir}/plplot%{version}/driversd/ljii.so -%{_libdir}/plplot%{version}/driversd/ljiip.rc -%{_libdir}/plplot%{version}/driversd/ljiip.so %{_libdir}/plplot%{version}/driversd/mem.rc %{_libdir}/plplot%{version}/driversd/mem.so %{_libdir}/plplot%{version}/driversd/ntk.rc %{_libdir}/plplot%{version}/driversd/ntk.so %{_libdir}/plplot%{version}/driversd/null.rc %{_libdir}/plplot%{version}/driversd/null.so -%{_libdir}/plplot%{version}/driversd/pbm.rc -%{_libdir}/plplot%{version}/driversd/pbm.so %{_libdir}/plplot%{version}/driversd/ps.rc %{_libdir}/plplot%{version}/driversd/ps.so %{_libdir}/plplot%{version}/driversd/pstex.rc @@ -457,8 +448,6 @@ fi %{_libdir}/plplot%{version}/driversd/psttf.so %{_libdir}/plplot%{version}/driversd/svg.rc %{_libdir}/plplot%{version}/driversd/svg.so -%{_libdir}/plplot%{version}/driversd/tek.rc -%{_libdir}/plplot%{version}/driversd/tek.so %{_libdir}/plplot%{version}/driversd/xfig.rc %{_libdir}/plplot%{version}/driversd/xfig.so %{_libdir}/plplot%{version}/driversd/xwin.rc @@ -470,7 +459,6 @@ fi %{_includedir}/plplot/ %{_libdir}/libcsirocsa.so %{_libdir}/libcsironn.so -%{_libdir}/libnistcd.so %{_libdir}/libplplotcxxd.so %{_libdir}/libplplotd.so %{_libdir}/libplplotf77cd.so @@ -562,7 +550,7 @@ fi %files perl %defattr(-,root,root,-) %{_datadir}/plplot%{version}/examples/perl/ -%{_datadir}/plplot%{version}/examples/test_perl.sh +%{_datadir}/plplot%{version}/examples/test_pdl.sh %endif %files tk @@ -596,11 +584,16 @@ fi %{_libdir}/plplot%{version}/driversd/wxwidgets.so %files wxGTK-devel +%defattr(-,root,root,-) %{_libdir}/libplplotwxwidgetsd.so %{_libdir}/pkgconfig/plplotd-wxwidgets.pc %changelog +* Mon Sep 28 2009 - Orion Poplawski - 5.9.5-1 +- Update to 5.9.5 +- Disable qt tests for now until Xvfb bug is fixed. + * Wed Aug 26 2009 - Orion Poplawski - 5.9.4-8 - Update octave patch to hopefully fix remaining issue. - Re-enable tests diff --git a/sources b/sources index 26003dd..4674fc1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -db172aaf0a7aa429b63d9bbd28637fd4 plplot-5.9.4.tar.gz +214c9f984f046bee18f6a3cce2cdec39 plplot-5.9.5.tar.gz