diff --git a/.gitignore b/.gitignore index 8a8296b..2d634c0 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ ParaView-3.8.1.tar.gz +/ParaView-3.10.0-RC1.tar.gz +/ParaView-3.10.0.tar.gz diff --git a/paraview-3.10.0-gcc46.patch b/paraview-3.10.0-gcc46.patch new file mode 100644 index 0000000..42dc5f9 --- /dev/null +++ b/paraview-3.10.0-gcc46.patch @@ -0,0 +1,20 @@ +--- ParaView-3.10.0-RC1/VTK/Utilities/vtkmetaio/metaUtils.cxx.gcc46 2011-02-02 10:52:15.000000000 -0700 ++++ ParaView-3.10.0-RC1/VTK/Utilities/vtkmetaio/metaUtils.cxx 2011-02-03 22:15:11.805540179 -0700 +@@ -32,6 +32,7 @@ + #include + #include + #include ++#include + + #if defined (__BORLANDC__) && (__BORLANDC__ >= 0x0580) + #include +--- ParaView-3.10.0-RC1/VTK/Wrapping/Python/PyVTKObject.cxx.gcc46 2011-02-02 10:52:17.000000000 -0700 ++++ ParaView-3.10.0-RC1/VTK/Wrapping/Python/PyVTKObject.cxx 2011-02-03 22:27:55.613083292 -0700 +@@ -34,6 +34,7 @@ + #include "vtkDataArray.h" + + #include ++#include + + //-------------------------------------------------------------------- + static PyObject *PyVTKObject_String(PyObject *op) diff --git a/paraview-3.6.2-libs.patch b/paraview-3.6.2-libs.patch deleted file mode 100644 index e69f320..0000000 --- a/paraview-3.6.2-libs.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- ParaView3/Utilities/IceT/tests/CMakeLists.txt.libs 2005-12-16 12:02:08.000000000 -0700 -+++ ParaView3/Utilities/IceT/tests/CMakeLists.txt 2010-02-16 09:39:07.911386524 -0700 -@@ -37,6 +37,7 @@ - icet_strategies - icet_mpi - ${OPENGL_glu_LIBRARY} -+ m - ) - - IF (ICET_MPIRUN_EXE) diff --git a/paraview-3.8.0-py27.patch b/paraview-3.8.0-py27.patch deleted file mode 100644 index 87d2261..0000000 --- a/paraview-3.8.0-py27.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ParaView-3.8.0/VTK/CMake/FindPythonLibs.cmake.py27 2010-05-27 11:06:53.000000000 -0600 -+++ ParaView-3.8.0/VTK/CMake/FindPythonLibs.cmake 2010-07-30 10:02:42.033258581 -0600 -@@ -27,7 +27,7 @@ - # Search for the python framework on Apple. - CMAKE_FIND_FRAMEWORKS(Python) - --FOREACH(_CURRENT_VERSION 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5) -+FOREACH(_CURRENT_VERSION 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5) - STRING(REPLACE "." "" _CURRENT_VERSION_NO_DOTS ${_CURRENT_VERSION}) - IF(WIN32) - FIND_LIBRARY(PYTHON_DEBUG_LIBRARY diff --git a/paraview.spec b/paraview.spec index ffab787..891a71b 100644 --- a/paraview.spec +++ b/paraview.spec @@ -1,30 +1,30 @@ %{!?build_openmpi:%global build_openmpi 1} %{!?build_mpich2:%global build_mpich2 1} -%define pv_maj 3 -%define pv_min 8 -%define pv_patch 1 -%define pv_majmin %{pv_maj}.%{pv_min} +%global pv_maj 3 +%global pv_min 10 +%global pv_patch 0 +%global pv_majmin %{pv_maj}.%{pv_min} +%global rcver %{nil} %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} Name: paraview Version: %{pv_majmin}.%{pv_patch} -Release: 4%{?dist} +Release: 1%{?dist} Summary: Parallel visualization application Group: Applications/Engineering License: BSD URL: http://www.paraview.org/ -Source0: http://www.paraview.org/files/v%{pv_majmin}/ParaView-%{version}.tar.gz +Source0: http://www.paraview.org/files/v%{pv_majmin}/ParaView-%{version}%{?rcver}.tar.gz Source1: paraview_22x22.png Source2: paraview.xml -#Add needed link libraries -#http://public.kitware.com/Bug/view.php?id=10298 -Patch0: paraview-3.6.2-libs.patch +#Patch from upsream to fix examples build issue +Patch0: paraview-3.10.0-build.patch #Add some needed includes Patch1: paraview-3.8.0-include.patch -#Support Python 2.7 -Patch3: paraview-3.8.0-py27.patch +#Need some more includes () for gcc 4.6.0 +Patch2: paraview-3.10.0-gcc46.patch #Installs PointSpriteDemo into incorrect location, remove install for now #Reported upstream: http://public.kitware.com/mantis/view.php?id=9292 Patch5: paraview-3.8.0-demo.patch @@ -40,7 +40,8 @@ BuildRequires: openmpi-devel %if %{build_mpich2} BuildRequires: mpich2-devel %endif -BuildRequires: qt4-devel, mesa-libOSMesa-devel +BuildRequires: qt-devel +BuildRequires: mesa-libOSMesa-devel BuildRequires: python-devel, tk-devel, hdf5-devel BuildRequires: freetype-devel, libtiff-devel, zlib-devel BuildRequires: expat-devel @@ -62,56 +63,69 @@ Obsoletes: paraview-devel < %{version}-%{release} Obsoletes: paraview-doc < %{version}-%{release} Provides: paraview-doc = %{version}-%{release} -#VTK_USE_RPATH=OFF needed to build everything -# This is still an alpha feature and does not install properly - -# libOverViewCora.so is not installed -# -DPARAVIEW_BUILD_OverView:BOOL=ON -# These require OverView -# -DPARAVIEW_BUILD_PLUGIN_ClientGeoView:BOOL=ON -# -DPARAVIEW_BUILD_PLUGIN_ClientGeoView2D:BOOL=ON -# -DPARAVIEW_BUILD_PLUGIN_ClientGraphView:BOOL=ON \\\ -# -DPARAVIEW_BUILD_PLUGIN_ClientHierarchyView:BOOL=ON \\\ -# -DPARAVIEW_BUILD_PLUGIN_ClientRecordView:BOOL=ON \\\ -# -DPARAVIEW_BUILD_PLUGIN_ClientTableView:BOOL=ON \\\ -# -DPARAVIEW_BUILD_PLUGIN_ClientTreeView:BOOL=ON \\\ -# -DPARAVIEW_BUILD_PLUGIN_ClientGraphViewFrame:BOOL=ON -# -DPARAVIEW_BUILD_PLUGIN_CommonToolbar:BOOL=ON \\\ -# -DPARAVIEW_BUILD_PLUGIN_GraphLayoutFilterPanel:BOOL=ON \\\ -# -DPARAVIEW_BUILD_PLUGIN_StatisticsToolbar:BOOL=ON -# -DPARAVIEW_BUILD_PLUGIN_SQLDatabaseGraphSourcePanel:BOOL=ON \\\ -# -DPARAVIEW_BUILD_PLUGIN_SQLDatabaseTableSourcePanel:BOOL=ON \\\ -# -DPARAVIEW_BUILD_PLUGIN_SplitTableFieldPanel:BOOL=ON \\\ -# -DPARAVIEW_BUILD_PLUGIN_TableToGraphPanel:BOOL=ON \\\ -# -DPARAVIEW_BUILD_PLUGIN_TableToSparseArrayPanel:BOOL=ON \\\ -# -DPARAVIEW_BUILD_PLUGIN_ThresholdTablePanel:BOOL=ON +#-- Plugin: EyeDomeLighting disabled +#-- Plugin: Manta ray traced rendering disabled - Requires Manta +#-- Plugin: NetDMF file format reader disabled - Requires NetDMF +#-- Plugin: Override time requests disabled +#-- Plugin: Plugin for creating python coprocessing scripts disabled +#-- Plugin: Plugin to read NCAR VDF files disabled - Requires Vapor +#-- Plugin: Reader for *.bp files based on Adios disabled +#-- Plugin: Virtual Reality Private Network (VRPN) tracker disabled - Requires VRPN +#-- Plugin: Virtual Reality User Interface (VRUI) tracker disabled +#-- Plugin: Virtual Reality User Interface (VRUI) tracker enabled +#CMake Error at Plugins/VRUI/CMakeLists.txt:7 (FIND_PACKAGE): +# Could not find module FindParaView.cmake or a configuration file for +# package ParaView. +# Adjust CMAKE_MODULE_PATH to find FindParaView.cmake or set ParaView_DIR to +# the directory containing a CMake configuration file for ParaView. The file +# will have one of the following names: +# ParaViewConfig.cmake +# paraview-config.cmake %define paraview_cmake_options \\\ -DCMAKE_CXX_COMPILER:FILEPATH=$CXX \\\ -DCMAKE_C_COMPILER:FILEPATH=$CC \\\ -DTCL_LIBRARY:PATH=tcl \\\ -DTK_LIBRARY:PATH=tk \\\ - -DPARAVIEW_BUILD_StreamingParaView:BOOL=ON \\\ - -DPARAVIEW_BUILD_PLUGIN_Streaming:BOOL=ON \\\ + -DPARAVIEW_BUILD_PLUGIN_AdiosReader:BOOL=ON \\\ -DPARAVIEW_BUILD_PLUGIN_Array:BOOL=ON \\\ - -DPARAVIEW_BUILD_PLUGIN_CosmoFilters:BOOL=ON \\\ + -DPARAVIEW_BUILD_PLUGIN_ChartViewFrame:BOOL=ON \\\ + -DPARAVIEW_BUILD_PLUGIN_ClientChartView:BOOL=ON \\\ + -DPARAVIEW_BUILD_PLUGIN_ClientGeoView2D:BOOL=ON \\\ + -DPARAVIEW_BUILD_PLUGIN_ClientGeoView:BOOL=ON \\\ + -DPARAVIEW_BUILD_PLUGIN_ClientGraphView:BOOL=ON \\\ + -DPARAVIEW_BUILD_PLUGIN_ClientGraphViewFrame:BOOL=ON \\\ + -DPARAVIEW_BUILD_PLUGIN_ClientRecordView:BOOL=ON \\\ + -DPARAVIEW_BUILD_PLUGIN_ClientRichTextView:BOOL=ON \\\ + -DPARAVIEW_BUILD_PLUGIN_ClientTableView:BOOL=ON \\\ + -DPARAVIEW_BUILD_PLUGIN_ClientTreeAreaView:BOOL=ON \\\ + -DPARAVIEW_BUILD_PLUGIN_ClientTreeView:BOOL=ON \\\ + -DPARAVIEW_BUILD_PLUGIN_CommonToolbar:BOOL=ON \\\ + -DPARAVIEW_BUILD_PLUGIN_CoProcessingScriptGenerator:BOOL=ON \\\ + -DPARAVIEW_BUILD_PLUGIN_EyeDomeLighting:BOOL=ON \\\ + -DPARAVIEW_BUILD_PLUGIN_ForceTime:BOOL=ON \\\ + -DPARAVIEW_BUILD_PLUGIN_GraphLayoutFilterPanel:BOOL=ON \\\ -DPARAVIEW_BUILD_PLUGIN_Infovis:BOOL=ON \\\ - -DPARAVIEW_BUILD_PLUGIN_netCDFReaders:BOOL=ON \\\ - -DPARAVIEW_BUILD_PLUGIN_pvblot:BOOL=ON \\\ - -DPARAVIEW_BUILD_PLUGIN_SLACTools:BOOL=ON \\\ - -DPARAVIEW_BUILD_PLUGIN_VisItReaderPlugin:BOOL=OFF \\\ + -DPARAVIEW_BUILD_PLUGIN_SplitTableFieldPanel:BOOL=ON \\\ + -DPARAVIEW_BUILD_PLUGIN_SQLDatabaseGraphSourcePanel:BOOL=ON \\\ + -DPARAVIEW_BUILD_PLUGIN_SQLDatabaseTableSourcePanel:BOOL=ON \\\ + -DPARAVIEW_BUILD_PLUGIN_StatisticsToolbar:BOOL=ON \\\ + -DPARAVIEW_BUILD_PLUGIN_TableToGraphPanel:BOOL=ON \\\ + -DPARAVIEW_BUILD_PLUGIN_TableToSparseArrayPanel:BOOL=ON \\\ + -DPARAVIEW_BUILD_PLUGIN_ThresholdTablePanel:BOOL=ON \\\ -DPARAVIEW_ENABLE_PYTHON:BOOL=ON \\\ -DPARAVIEW_INSTALL_THIRD_PARTY_LIBRARIES:BOOL=OFF \\\ - -DPARAVIEW_USE_SYSTEM_HDF5:BOOL=ON \\\ -DVTK_OPENGL_HAS_OSMESA:BOOL=ON \\\ -DVTK_USE_BOOST:BOOL=ON \\\ -DVTK_USE_INFOVIS:BOOL=OFF \\\ -DVTK_USE_N_WAY_ARRAYS:BOOL=ON \\\ - -DVTK_USE_RPATH:BOOL=OFF \\\ -DVTK_USE_SYSTEM_EXPAT:BOOL=ON \\\ -DVTK_USE_SYSTEM_FREETYPE:BOOL=ON \\\ + -DVTK_USE_SYSTEM_HDF5:BOOL=ON \\\ -DVTK_USE_SYSTEM_JPEG:BOOL=ON \\\ -DVTK_USE_SYSTEM_PNG:BOOL=ON \\\ -DVTK_USE_SYSTEM_TIFF:BOOL=ON \\\ -DVTK_USE_SYSTEM_ZLIB:BOOL=ON \\\ + -DXDMF_WRAP_PYTHON:BOOL=ON \\\ -DBUILD_DOCUMENTATION:BOOL=ON \\\ -DBUILD_EXAMPLES:BOOL=ON @@ -195,14 +209,14 @@ BuildArch: noarch %prep -%setup -q -n ParaView-%{version} -%patch0 -p1 -b .libs +%setup -q -n ParaView-%{version}%{?rcver} +%patch0 -p1 -b .build %patch1 -p1 -b .include -%patch3 -p1 -b .py27 +%patch2 -p1 -b .gcc46 %patch5 -p1 -b .demo %patch7 -p1 -b .hdf5 #Remove included hdf5 just to be sure -rm -r Utilities/hdf5 +rm -r VTK/Utilities/vtkhdf5 %build @@ -271,12 +285,14 @@ make install DESTDIR=$RPM_BUILD_ROOT #Cleanup %{_bindir} pushd $RPM_BUILD_ROOT/%{_libdir}/openmpi/bin #Don't need mpi versions of these -rm paraview streaming_paraview lproj pvblot pvpython +rm paraview pvblot pvpython #Move the remaining mpi binaries out of the way for f in pvbatch pvdataserver pvrenderserver pvserver smTestDriver do mv $f ${f}_openmpi done +# Fix up python install +mv Python $RPM_BUILD_ROOT%{_libdir}/openmpi/lib/paraview/ popd #Remove mpi copy of includes, man pages, and documentation @@ -293,12 +309,14 @@ make install DESTDIR=$RPM_BUILD_ROOT #Cleanup %{_bindir} pushd $RPM_BUILD_ROOT/%{_libdir}/mpich2/bin #Don't need mpi versions of these -rm paraview streaming_paraview lproj pvblot pvpython +rm paraview pvblot pvpython #Move the remaining mpi binaries out of the way for f in pvbatch pvdataserver pvrenderserver pvserver smTestDriver do mv $f ${f}_mpich2 done +# Fix up python install +mv Python $RPM_BUILD_ROOT%{_libdir}/mpich2/lib/paraview/ popd #Remove mpi copy of includes, man pages, and documentation @@ -331,11 +349,10 @@ desktop-file-install --vendor=fedora \ --dir %{buildroot}%{_datadir}/applications/ \ paraview.desktop +# Fix up python install +mv $RPM_BUILD_ROOT%{_bindir}/Python $RPM_BUILD_ROOT%{_libdir}/paraview/ popd -#Don't ship lproj - provided by vtk -rm $RPM_BUILD_ROOT%{_bindir}/lproj - %clean rm -rf $RPM_BUILD_ROOT @@ -377,7 +394,6 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %{_bindir}/pvrenderserver %{_bindir}/pvserver %{_bindir}/smTestDriver -%{_bindir}/streaming_paraview %{_libdir}/paraview/ @@ -415,6 +431,14 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %changelog +* Mon Apr 4 2011 Orion Poplawski - 3.10.0-1 +- Update to 3.10.0 +- Drop lib and py27 patches fixed upstream +- Add patch for gcc 4.6.0 support +- Update system hdf5 handling +- Cleanup unused build options +- Build more plugins + * Wed Oct 20 2010 Adam Jackson 3.8.1-4 - Rebuild for new libOSMesa soname diff --git a/sources b/sources index 3899b64..3005747 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b432b9e68cc308ae8f086d759f578125 ParaView-3.8.1.tar.gz +5369f05667f1ad8aaca7a879208aeb3c ParaView-3.10.0.tar.gz