[paraview] - Update to 3.98.0 - Remove source of more bundled libraries - Drop include, gcc47, vtkboost, and hd
Orion Poplawski
orion at fedoraproject.org
Mon Dec 17 21:32:01 UTC 2012
commit 3959c95a0276043ce11cf83a88239f03f16e9c04
Author: Orion Poplawski <orion at nwra.com>
Date: Mon Dec 17 14:31:58 2012 -0700
- Update to 3.98.0
- Remove source of more bundled libraries
- Drop include, gcc47, vtkboost, and hdf5 patches
- Rebase kwprocessxml_rpath and system library patches
- Add patch to fix install locations
- Add patch to use system protobuf
- Add BR gl2ps-devel >= 1.3.8
- Disable ForceTime plugin for now
- Disable pvblot for now
- Build with hdf5 1.8.10
.gitignore | 1 +
paraview-3.12.0-boost-1.48.0-bfs.patch | 31 ------
paraview-3.2.2-hdf5.patch | 11 --
paraview-3.8.0-include.patch | 20 ----
paraview-Protobuf.patch | 60 ++++++++++++
paraview-gcc47.patch | 35 -------
paraview-install.patch | 12 +++
paraview-kwprocessxml_rpath.patch | 52 +++++-----
paraview-pvblot.patch | 34 +++++++
paraview-vtkboost.patch | 22 -----
paraview.spec | 160 +++++++++++++++++---------------
sources | 2 +-
vtk-5.6.1-system.patch | 26 -----
vtk-6.0.0-netcdf.patch | 75 +++++++++++++++
vtk-6.0.0-system.patch | 27 ++++++
15 files changed, 323 insertions(+), 245 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ae719bb..f1322fb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ ParaView-3.8.1.tar.gz
/ParaView-3.12.0.tar.gz
/ParaView-3.14.0-Source.tar.gz
/ParaView-3.14.1-Source.tar.gz
+/ParaView-3.98.0-src.tgz
diff --git a/paraview-Protobuf.patch b/paraview-Protobuf.patch
new file mode 100644
index 0000000..871ce12
--- /dev/null
+++ b/paraview-Protobuf.patch
@@ -0,0 +1,60 @@
+diff -up ParaView/ParaViewCore/ServerImplementation/Core/CMakeLists.txt.Protobuf ParaView/ParaViewCore/ServerImplementation/Core/CMakeLists.txt
+--- ParaView/ParaViewCore/ServerImplementation/Core/CMakeLists.txt.Protobuf 2012-11-27 09:09:41.000000000 -0700
++++ ParaView/ParaViewCore/ServerImplementation/Core/CMakeLists.txt 2012-11-27 13:00:36.072178577 -0700
+@@ -80,16 +80,16 @@ set (${vtk-module}_HDRS
+ #------------------------------------------------------------------------------
+ # Generate the protbuf message file.
+ #------------------------------------------------------------------------------
+-get_target_property(PROTOC_LOCATION protoc_compiler LOCATION)
++get_target_property(PROTOC_LOCATION protoc LOCATION)
+ add_custom_command(
+ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/vtkPVMessage.pb.h
+ ${CMAKE_CURRENT_BINARY_DIR}/vtkPVMessage.pb.cc
+
+- COMMAND protoc_compiler
++ COMMAND protoc
+ "--cpp_out=dllexport_decl=VTKPVSERVERIMPLEMENTATIONCORE_EXPORT:${CMAKE_CURRENT_BINARY_DIR}"
+ --proto_path "@CMAKE_CURRENT_SOURCE_DIR@"
+ "${CMAKE_CURRENT_SOURCE_DIR}/vtkPVMessage.proto"
+- DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/vtkPVMessage.proto protoc_compiler
++ DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/vtkPVMessage.proto
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+ )
+
+@@ -108,5 +108,7 @@ endif()
+ vtk_module_library(vtkPVServerImplementationCore
+ ${Module_SRCS})
+
++target_link_libraries(vtkPVServerImplementationCore -lpthread)
++
+ add_dependencies(vtkPVServerImplementationCore
+ protobuf_code_generation)
+diff -up ParaView/ThirdParty/protobuf/CMakeLists.txt.Protobuf ParaView/ThirdParty/protobuf/CMakeLists.txt
+--- ParaView/ThirdParty/protobuf/CMakeLists.txt.Protobuf 2012-11-27 09:09:45.000000000 -0700
++++ ParaView/ThirdParty/protobuf/CMakeLists.txt 2012-11-27 13:02:04.535632175 -0700
+@@ -34,7 +34,7 @@ set (PROTOBUF_INSTALL_BIN_DIR ${VTK_INST
+ set (PROTOBUF_INSTALL_LIB_DIR ${VTK_INSTALL_LIBRARY_DIR})
+ set (PROTOBUF_INSTALL_EXPORT_NAME ${VTK_INSTALL_EXPORT_NAME})
+
+-vtk_module_third_party(protobuf
++vtk_module_third_party(Protobuf
+ INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/vtkprotobuf/src
+ LIBRARIES protobuf
+ )
+@@ -42,11 +42,11 @@ vtk_module_third_party(protobuf
+ # protobuf exports it's build-dir targets to a custom file
+ # (PROTOBUF_EXPORTS.cmake). We don't care much about that. We export
+ # build-dir targets ourselves.
+-vtk_target_export(protobuf)
+-vtk_target_export(protobuf-lite)
+-if (NOT CMAKE_CROSSCOMPILING)
+- vtk_compile_tools_target_export(protoc_compiler)
+-endif()
++#vtk_target_export(protobuf)
++#vtk_target_export(protobuf-lite)
++#if (NOT CMAKE_CROSSCOMPILING)
++# vtk_compile_tools_target_export(protoc_compiler)
++#endif()
+
+ # All these exports don't add any install rules. However we make protobuf itself
+ # install components at the right location by setting PROTOBUF_INSTALL_*
diff --git a/paraview-install.patch b/paraview-install.patch
new file mode 100644
index 0000000..529e32f
--- /dev/null
+++ b/paraview-install.patch
@@ -0,0 +1,12 @@
+diff -up ParaView-3.98.0-src/Plugins/SciberQuestToolKit/CMakeLists.txt.install ParaView-3.98.0-src/Plugins/SciberQuestToolKit/CMakeLists.txt
+--- ParaView-3.98.0-src/Plugins/SciberQuestToolKit/CMakeLists.txt.install 2012-12-03 08:31:22.000000000 -0700
++++ ParaView-3.98.0-src/Plugins/SciberQuestToolKit/CMakeLists.txt 2012-12-05 11:20:52.659956535 -0700
+@@ -82,7 +82,7 @@ set (SQTK_VERSION "SQTK-${SQTK_RELEASE}
+
+ # put the plugin inside the pv install
+ set(SQTK_LIB_INSTALL_PATH
+- "${CMAKE_INSTALL_PREFIX}/lib/paraview-${PARAVIEW_VERSION_MAJOR}.${PARAVIEW_VERSION_MINOR}"
++ "${PV_INSTALL_LIB_DIR}"
+ )
+ #message(STATUS "SQTK will be installed at ${SQTK_LIB_INSTALL_PATH}")
+
diff --git a/paraview-kwprocessxml_rpath.patch b/paraview-kwprocessxml_rpath.patch
index f71ead9..f3439bd 100644
--- a/paraview-kwprocessxml_rpath.patch
+++ b/paraview-kwprocessxml_rpath.patch
@@ -1,27 +1,27 @@
-Description: This patch forces building of kwProcessXML as shared forwarded
- executable in our case (even is CMAKE_SKIP_RPATH is OFF in debian)
-Author: Mathieu Malaterre <mathieu.malaterre at gmail.com>
-Bug-Debian: http://bugs.debian.org/640305
-Last-Update: 2011-09-13
-
---- a/Common/KWCommon/CMakeLists.txt
-+++ b/Common/KWCommon/CMakeLists.txt
-@@ -225,7 +225,7 @@
- IF(KWCOMMON_BUILD_PROCESSXML)
- # For shared libraries on non-windows systems use the KWSys shared-forward
- # implementation to make sure shared libraries are found.
-- IF(BUILD_SHARED_LIBS AND CMAKE_SKIP_RPATH)
-+ IF(BUILD_SHARED_LIBS )
- IF(NOT WIN32)
- SET(KWCommon_FORWARD_DIR_BUILD ${EXECUTABLE_OUTPUT_PATH})
- SET(KWCommon_FORWARD_BIN_TO_LIB "..${KWCommon_INSTALL_LIB_DIR}")
-@@ -248,7 +248,7 @@
- COMPONENT Development)
- ENDIF(NOT KWCommon_INSTALL_NO_DEVELOPMENT)
- ENDIF(NOT WIN32)
-- ENDIF(BUILD_SHARED_LIBS AND CMAKE_SKIP_RPATH)
-+ ENDIF(BUILD_SHARED_LIBS )
+diff -up ParaView-3.98.0-src/Utilities/ProcessXML/CMakeLists.txt.kwprocessxml_rpath ParaView-3.98.0-src/Utilities/ProcessXML/CMakeLists.txt
+--- ParaView-3.98.0-src/Utilities/ProcessXML/CMakeLists.txt.kwprocessxml_rpath 2012-12-03 08:31:26.000000000 -0700
++++ ParaView-3.98.0-src/Utilities/ProcessXML/CMakeLists.txt 2012-12-07 10:53:37.407649217 -0700
+@@ -33,19 +33,10 @@ vtk_module_export("")
- ADD_EXECUTABLE(kwProcessXML${KWCommon_EXE_SUFFIX} ProcessXML.cxx)
- TARGET_LINK_LIBRARIES(kwProcessXML${KWCommon_EXE_SUFFIX} vtkCommon vtksys)
-
+ include(vtkForwardingExecutable)
+ if (NOT CMAKE_CROSSCOMPILING)
+- add_executable(kwProcessXML ProcessXML.cxx)
++ vtk_add_executable_with_forwarding(out_exe_suffix kwProcessXML ProcessXML.cxx)
+ target_link_libraries(kwProcessXML vtkCommonCore vtksys)
+-
+- if (UNIX)
+- # setup install rpath correctly so that kwProcessXML can file needed libraries
+- # at runtime.
+- set (_temp_prefix "/tmp")
+- set (_bin "${_temp_prefix}/${VTK_INSTALL_RUNTIME_DIR}")
+- set (_so "${_temp_prefix}/${VTK_INSTALL_LIBRARY_DIR}")
+- file (RELATIVE_PATH relative_path "${_bin}" "${_so}")
+- set_target_properties(kwProcessXML PROPERTIES
+- INSTALL_RPATH "\$ORIGIN/${relative_path}")
+- endif()
+-
+ vtk_compile_tools_target(kwProcessXML)
++ if (NOT VTK_INSTALL_NO_DEVELOPMENT)
++ pv_executable_install(kwProcessXML "${out_exe_suffix}")
++ endif()
+ endif()
diff --git a/paraview-pvblot.patch b/paraview-pvblot.patch
new file mode 100644
index 0000000..058d934
--- /dev/null
+++ b/paraview-pvblot.patch
@@ -0,0 +1,34 @@
+diff -ru ParaView-3.98.0-src/Plugins/pvblot/CMakeLists.txt ParaView/Plugins/pvblot/CMakeLists.txt
+--- ParaView-3.98.0-src/Plugins/pvblot/CMakeLists.txt 2012-12-03 08:31:22.000000000 -0700
++++ ParaView/Plugins/pvblot/CMakeLists.txt 2012-12-14 16:11:24.109249505 -0700
+@@ -69,18 +69,11 @@
+ GET_TARGET_PROPERTY(PVBLOT_PVPYTHON_EXECUTABLE pvpython LOCATION)
+ SET(PVBLOT_BLOTISH_PATH "${CMAKE_CURRENT_SOURCE_DIR}")
+
+-SET(script_extension)
++SET(script_ext)
+ IF(WIN32 AND NOT CYGWIN)
+ SET(script_ext ".bat")
+ ENDIF(WIN32 AND NOT CYGWIN)
+
+-CONFIGURE_FILE(
+- "${CMAKE_CURRENT_SOURCE_DIR}/pvblot${script_exe}.in"
+- "${EXECUTABLE_OUTPUT_PATH}/pvblot${script_exe}"
+- @ONLY
+- )
+-
+-
+ #############################################################################
+ # Set up pvblot script for when ParaView is installed. This includes
+ # installing the Python source files.
+@@ -94,8 +87,8 @@
+
+
+ CONFIGURE_FILE(
+- "${CMAKE_CURRENT_SOURCE_DIR}/pvblot${script_exe}.in"
+- "${ParaView_BINARY_DIR}/CMake/tmp/pvblot${script_exe}"
++ "${CMAKE_CURRENT_SOURCE_DIR}/pvblot${script_ext}.in"
++ "${ParaView_BINARY_DIR}/CMake/tmp/pvblot${script_ext}"
+ @ONLY
+ )
+
diff --git a/paraview.spec b/paraview.spec
index 2cfe2d5..bc25f33 100644
--- a/paraview.spec
+++ b/paraview.spec
@@ -4,39 +4,40 @@
%{!?build_openmpi:%global build_openmpi 1}
%{!?build_mpich2:%global build_mpich2 1}
%global pv_maj 3
-%global pv_min 14
-%global pv_patch 1
+%global pv_min 98
+%global pv_patch 0
%global pv_majmin %{pv_maj}.%{pv_min}
-#global rcver -RC2
+%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: 5%{?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}%{?rcver}-Source.tar.gz
+Source0: http://www.paraview.org/files/v%{pv_majmin}/ParaView-%{version}%{?rcver}-src.tgz
Source1: paraview_22x22.png
Source2: paraview.xml
-#Add some needed includes
-Patch1: paraview-3.8.0-include.patch
+# Patch to fix install locations
+# http://paraview.org/Bug/view.php?id=13704
+Patch0: paraview-install.patch
#Patch to vtk (from vtk package) to use system libraries
-Patch2: vtk-5.6.1-system.patch
-#Patch to build with gcc 4.7
-#Reported upstream: http://paraview.org/Bug/view.php?id=12881
-Patch3: paraview-gcc47.patch
+Patch1: vtk-6.0.0-system.patch
+# Capitalize Protobuf so it finds FindProtobuf.cmake
+Patch2: paraview-Protobuf.patch
+#Patch to vtk to use system netcdf library
+Patch3: vtk-6.0.0-netcdf.patch
#Build kwProcessXML as forwarded executable
#https://bugzilla.redhat.com/show_bug.cgi?id=808490
#http://paraview.org/Bug/view.php?id=13054
Patch4: paraview-kwprocessxml_rpath.patch
-#Patch vtkBoostBreadthFirstSearchTree.cxx to vtk 5.10.1 version to compile with current boost
-Patch5: paraview-vtkboost.patch
-#Reported upstream: http://public.kitware.com/mantis/view.php?id=7023
-Patch7: paraview-3.2.2-hdf5.patch
+# Upstream patch to fix pvblot build
+# http://www.paraview.org/Bug/view.php?id=13654
+Patch5: paraview-pvblot.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -61,6 +62,7 @@ BuildRequires: openssl-devel
BuildRequires: gnuplot
BuildRequires: wget
BuildRequires: boost-devel
+BuildRequires: gl2ps-devel >= 1.3.8
BuildRequires: hwloc-devel
BuildRequires: libjpeg-devel
BuildRequires: libpng-devel
@@ -76,25 +78,12 @@ Provides: paraview-demos = %{version}-%{release}
Obsoletes: paraview-doc < %{version}-%{release}
Provides: paraview-doc = %{version}-%{release}
-#-- 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
+#-- Plugin: VRPlugin - Virtual Reality Devices and Interactor styles : Disabled - Requires VRPN
+#-- Plugin: MantaView - Manta Ray-Cast View : Disabled - Requires Manta
+#-- Plugin: ForceTime - Override time requests : Disabled - Build is failing
+#-- Plugin: VaporPlugin - Plugin to read NCAR VDR files : Disabled - Requires vapor
%define paraview_cmake_options \\\
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \\\
-DCMAKE_CXX_COMPILER:FILEPATH=$CXX \\\
-DCMAKE_C_COMPILER:FILEPATH=$CC \\\
-DTCL_LIBRARY:PATH=tcl \\\
@@ -102,18 +91,24 @@ Provides: paraview-doc = %{version}-%{release}
-DPARAVIEW_BUILD_PLUGIN_AdiosReader:BOOL=ON \\\
-DPARAVIEW_BUILD_PLUGIN_CoProcessingScriptGenerator:BOOL=ON \\\
-DPARAVIEW_BUILD_PLUGIN_EyeDomeLighting:BOOL=ON \\\
- -DPARAVIEW_BUILD_PLUGIN_ForceTime:BOOL=ON \\\
+ -DPARAVIEW_BUILD_PLUGIN_ForceTime:BOOL=OFF \\\
-DPARAVIEW_ENABLE_PYTHON:BOOL=ON \\\
-DPARAVIEW_INSTALL_THIRD_PARTY_LIBRARIES:BOOL=OFF \\\
-DPARAVIEW_INSTALL_DEVELOPMENT:BOOL=ON \\\
- -DVTK_OPENGL_HAS_OSMESA:BOOL=ON \\\
+ -DVTK_CUSTOM_LIBRARY_SUFFIX="" \\\
+ -DVTK_INSTALL_PACKAGE_DIR=share/cmake/paraview \\\
-DVTK_USE_BOOST:BOOL=ON \\\
-DVTK_USE_INFOVIS:BOOL=OFF \\\
-DVTK_USE_N_WAY_ARRAYS:BOOL=ON \\\
-DVTK_USE_OGGTHEORA_ENCODER:BOOL=ON \\\
+ -DVTK_USE_SYSTEM_ICET=OFF \\\
-DVTK_USE_SYSTEM_LIBRARIES=ON \\\
-DVTK_USE_SYSTEM_HDF5=ON \\\
+ -DHDF5_HL_LIBRARY:FILEPATH=%{_libdir}/libhdf5_hl.so \\\
-DVTK_USE_SYSTEM_LIBPROJ4=OFF \\\
+ -DVTK_USE_SYSTEM_NETCDF=ON \\\
+ -DVTK_USE_SYSTEM_QTTESTING=OFF \\\
+ -DVTK_USE_SYSTEM_XDMF2=OFF \\\
-DXDMF_WRAP_PYTHON:BOOL=ON \\\
-DBUILD_DOCUMENTATION:BOOL=ON \\\
-DBUILD_EXAMPLES:BOOL=ON
@@ -224,15 +219,22 @@ developing applications that use %{name}-mpich2.
%prep
-%setup -q -n ParaView-%{version}%{?rcver}-Source
-%patch1 -p1 -b .include
-%patch2 -p0 -b .system
-%patch3 -p1 -b .gcc47
+%setup -q -n ParaView-%{version}-src
+%patch0 -p1 -b .install
+%patch1 -p0 -b .system
+%patch2 -p1 -b .Protobuf
+%patch3 -p0 -b .netcdf
%patch4 -p1 -b .kwprocessxml_rpath
-%patch5 -p1 -b .vtkboost
-%patch7 -p1 -b .hdf5
-#Remove included hdf5 just to be sure
-rm -r VTK/Utilities/vtkhdf5
+%patch5 -p1 -b .pvblot
+#Remove included thirdparty sources just to be sure
+for x in protobuf
+do
+ rm -r ThirdParty/${x}/vtk${x}
+done
+for x in expat freetype gl2ps hdf5 jpeg libxml2 netcdf oggtheora png sqlite tiff zlib
+do
+ rm -r VTK/ThirdParty/${x}/vtk${x}
+done
%build
@@ -244,8 +246,10 @@ export CXXFLAGS="$RPM_OPT_FLAGS"
mkdir fedora
pushd fedora
%cmake .. \
- -DPV_INSTALL_INCLUDE_DIR:PATH=include/paraview \
- -DPV_INSTALL_LIB_DIR:PATH=%{_lib}/paraview \
+ -DVTK_INSTALL_INCLUDE_DIR:PATH=include/paraview \
+ -DVTK_INSTALL_ARCHIVE_DIR:PATH=%{_lib}/paraview \
+ -DVTK_INSTALL_LIBRARY_DIR:PATH=%{_lib}/paraview \
+ -DPARAVIEW_INSTALL_DEVELOPMENT_FILES:BOOL=ON \
%{paraview_cmake_options}
make VERBOSE=1 %{?_smp_mflags}
popd
@@ -253,10 +257,12 @@ popd
mkdir fedora-openmpi
pushd fedora-openmpi
%{_openmpi_load}
-%cmake .. \
- -DPV_INSTALL_BIN_DIR:PATH=%{_lib}/openmpi/bin \
- -DPV_INSTALL_INCLUDE_DIR:PATH=%{_lib}/openmpi/include/paraview \
- -DPV_INSTALL_LIB_DIR:PATH=%{_lib}/openmpi/lib/paraview \
+cmake .. \
+ -DCMAKE_INSTALL_PREFIX:PATH=%{_libdir}/openmpi \
+ -DVTK_INSTALL_INCLUDE_DIR:PATH=include/paraview \
+ -DVTK_INSTALL_ARCHIVE_DIR:PATH=lib/paraview \
+ -DVTK_INSTALL_LIBRARY_DIR:PATH=lib/paraview \
+ -DPARAVIEW_INSTALL_DEVELOPMENT_FILES:BOOL=ON \
-DPARAVIEW_USE_MPI:BOOL=ON \
-DICET_BUILD_TESTING:BOOL=ON \
-DMPI_COMPILER:FILEPATH=%{_libdir}/openmpi/bin/mpicxx \
@@ -271,10 +277,12 @@ popd
mkdir fedora-mpich2
pushd fedora-mpich2
%{_mpich2_load}
-%cmake .. \
- -DPV_INSTALL_BIN_DIR:PATH=%{_lib}/mpich2/bin \
- -DPV_INSTALL_INCLUDE_DIR:PATH=%{_lib}/mpich2/include/paraview \
- -DPV_INSTALL_LIB_DIR:PATH=%{_lib}/mpich2/lib/paraview \
+cmake .. \
+ -DCMAKE_INSTALL_PREFIX:PATH=%{_libdir}/mpich2 \
+ -DVTK_INSTALL_INCLUDE_DIR:PATH=include/paraview \
+ -DVTK_INSTALL_ARCHIVE_DIR:PATH=lib/paraview \
+ -DVTK_INSTALL_LIBRARY_DIR:PATH=lib/paraview \
+ -DPARAVIEW_INSTALL_DEVELOPMENT_FILES:BOOL=ON \
-DPARAVIEW_USE_MPI:BOOL=ON \
-DICET_BUILD_TESTING:BOOL=ON \
-DMPI_COMPILER:FILEPATH=%{_libdir}/mpich2/bin/mpicxx \
@@ -316,12 +324,8 @@ do
done
popd
-#Remove mpi copy of man pages
-rm -rf $RPM_BUILD_ROOT%{_mandir}
-
-# Move python files by hand for now
-cp -rp $RPM_BUILD_ROOT%{_libdir}/openmpi/bin/Python/vtk $RPM_BUILD_ROOT%{_libdir}/openmpi/lib/paraview/site-packages/
-rm -rf $RPM_BUILD_ROOT%{_libdir}/openmpi/bin/Python
+#Remove mpi copy of doc and man pages
+rm -rf $RPM_BUILD_ROOT%{_libdir}/openmpi/share/{doc,man}
#Install vtk*Python.so by hand for now
mv $RPM_BUILD_ROOT%{_libdir}/openmpi/lib/paraview/vtk*Python.so $RPM_BUILD_ROOT%{_libdir}/openmpi/lib/paraview/site-packages/paraview/vtk/
@@ -345,12 +349,8 @@ do
done
popd
-#Remove mpi copy of man pages
-rm -rf $RPM_BUILD_ROOT%{_mandir}
-
-# Move python files by hand for now
-cp -rp $RPM_BUILD_ROOT%{_libdir}/mpich2/bin/Python/vtk $RPM_BUILD_ROOT%{_libdir}/mpich2/lib/paraview/site-packages/
-rm -rf $RPM_BUILD_ROOT%{_libdir}/mpich2/bin/Python
+#Remove mpi copy of doc and man pages
+rm -rf $RPM_BUILD_ROOT%{_libdir}/mpich2/share/{doc,man}
#Install vtk*Python.so by hand for now
mv $RPM_BUILD_ROOT%{_libdir}/mpich2/lib/paraview/vtk*Python.so $RPM_BUILD_ROOT%{_libdir}/mpich2/lib/paraview/site-packages/paraview/vtk/
@@ -382,16 +382,15 @@ desktop-file-install --vendor=fedora \
--dir %{buildroot}%{_datadir}/applications/ \
paraview.desktop
-# Move python files by hand for now
-cp -rp $RPM_BUILD_ROOT%{_bindir}/Python/vtk $RPM_BUILD_ROOT%{_libdir}/paraview/site-packages/
-rm -rf $RPM_BUILD_ROOT%{_bindir}/Python
-
#Install vtk*Python.so by hand for now
mv $RPM_BUILD_ROOT%{_libdir}/paraview/vtk*Python.so $RPM_BUILD_ROOT%{_libdir}/paraview/site-packages/paraview/vtk/
mv $RPM_BUILD_ROOT%{_libdir}/paraview/site-packages/paraview/vtk/vtkPV*Python.so $RPM_BUILD_ROOT%{_libdir}/paraview/site-packages/paraview/
-#Cleanup vtk conflicting binaries
-rm $RPM_BUILD_ROOT%{_bindir}/vtk{EncodeString,WrapHierarchy,WrapPython,WrapPythonInit}
+#Cleanup only vtk conflicting binaries
+rm $RPM_BUILD_ROOT%{_bindir}/vtk{EncodeString,HashSource,Parse{Java,OGLExt},ProcessShader,Wrap{Hierarchy,Java,Python,Tcl,TclInit,PythonInit}}
+# Special case until we get this right
+rm $RPM_BUILD_ROOT%{_bindir}/vtkkwProcessXML
+mv $RPM_BUILD_ROOT%{_libdir}/paraview/vtkkwProcessXML $RPM_BUILD_ROOT%{_libdir}/paraview/kwProcessXML
popd
@@ -445,6 +444,7 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
%{_bindir}/kwProcessXML
%{_bindir}/vtkWrapClientServer
%{_includedir}/paraview/
+%{_datadir}/cmake/
%{_datadir}/doc/paraview-%{pv_majmin}/
@@ -456,10 +456,11 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
%{_libdir}/openmpi/bin/pvrenderserver_openmpi
%{_libdir}/openmpi/bin/pvserver_openmpi
%{_libdir}/openmpi/bin/smTestDriver_openmpi
-%{_libdir}/openmpi/lib/paraview
+%{_libdir}/openmpi/lib/paraview/
%files openmpi-devel
%{_libdir}/openmpi/include/paraview/
+%{_libdir}/openmpi/share/cmake/
%endif
@@ -471,14 +472,27 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
%{_libdir}/mpich2/bin/pvrenderserver_mpich2
%{_libdir}/mpich2/bin/pvserver_mpich2
%{_libdir}/mpich2/bin/smTestDriver_mpich2
-%{_libdir}/mpich2/lib/paraview
+%{_libdir}/mpich2/lib/paraview/
%files mpich2-devel
%{_libdir}/mpich2/include/paraview/
+%{_libdir}/mpich2/share/cmake/
%endif
%changelog
+* Mon Dec 17 2012 Orion Poplawski <orion at cora.nwra.com> - 3.98.0-1
+- Update to 3.98.0
+- Remove source of more bundled libraries
+- Drop include, gcc47, vtkboost, and hdf5 patches
+- Rebase kwprocessxml_rpath and system library patches
+- Add patch to fix install locations
+- Add patch to use system protobuf
+- Add BR gl2ps-devel >= 1.3.8
+- Disable ForceTime plugin for now
+- Disable pvblot for now
+- Build with hdf5 1.8.10
+
* Thu Nov 1 2012 Orion Poplawski <orion at cora.nwra.com> - 3.14.1-5
- Rebuild for mpich2 1.5
- Add patch to compile with current boost
diff --git a/sources b/sources
index 4cfadc5..9d7b78a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-039c612777f5eb7bba5d37319f34c922 ParaView-3.14.1-Source.tar.gz
+fadf8df277735cbba2dfe87bdc1cd019 ParaView-3.98.0-src.tgz
diff --git a/vtk-6.0.0-netcdf.patch b/vtk-6.0.0-netcdf.patch
new file mode 100644
index 0000000..d6e132f
--- /dev/null
+++ b/vtk-6.0.0-netcdf.patch
@@ -0,0 +1,75 @@
+diff -up VTK/IO/NetCDF/CMakeLists.txt.system VTK/IO/NetCDF/CMakeLists.txt
+--- VTK/IO/NetCDF/CMakeLists.txt.system 2012-12-03 08:31:35.000000000 -0700
++++ VTK/IO/NetCDF/CMakeLists.txt 2012-12-06 10:04:07.601857782 -0700
+@@ -10,5 +10,5 @@ set(Module_SRCS
+
+ vtk_module_library(vtkIONetCDF ${Module_SRCS})
+
+-target_link_libraries(vtkIONetCDF vtkNetCDF_cxx)
++target_link_libraries(vtkIONetCDF netcdf_c++ netcdf)
+ set_target_properties(vtkIONetCDF PROPERTIES LINK_INTERFACE_LIBRARIES "")
+diff -up VTK/IO/ParallelNetCDF/CMakeLists.txt.system VTK/IO/ParallelNetCDF/CMakeLists.txt
+--- VTK/IO/ParallelNetCDF/CMakeLists.txt.system 2012-12-03 08:31:35.000000000 -0700
++++ VTK/IO/ParallelNetCDF/CMakeLists.txt 2012-12-06 10:03:01.691191800 -0700
+@@ -8,4 +8,4 @@ set(Module_SRCS
+
+ vtk_module_library(vtkIOParallelNetCDF ${Module_SRCS})
+
+-target_link_libraries(vtkIOParallelNetCDF vtkNetCDF_cxx)
++target_link_libraries(vtkIOParallelNetCDF netcdf)
+diff -up VTK/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt.system VTK/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt
+--- VTK/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt.system 2012-12-03 08:31:37.000000000 -0700
++++ VTK/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt 2012-12-06 10:04:38.784720013 -0700
+@@ -241,7 +241,7 @@ ENDIF(APPLE)
+
+
+ VTK_ADD_LIBRARY(vtkexoIIc ${cbind_SRCS})
+-TARGET_LINK_LIBRARIES(vtkexoIIc vtkNetCDF)
++TARGET_LINK_LIBRARIES(vtkexoIIc netcdf)
+
+ IF(NOT VTK_INSTALL_NO_DEVELOPMENT)
+ # INSTALL_FILES(${VTK_INSTALL_INCLUDE_DIR}/vtkexodus2 .h
+diff -up VTK/ThirdParty/netcdf/CMakeLists.txt.system VTK/ThirdParty/netcdf/CMakeLists.txt
+--- VTK/ThirdParty/netcdf/CMakeLists.txt.system 2012-12-03 08:31:39.000000000 -0700
++++ VTK/ThirdParty/netcdf/CMakeLists.txt 2012-12-06 09:58:22.810749439 -0700
+@@ -1,8 +1,12 @@
+ set(vtknetcdf_THIRD_PARTY 1)
+-set(vtknetcdf_LIBRARIES vtkNetCDF vtkNetCDF_cxx)
+-set(vtknetcdf_INCLUDE_DIRS
+- ${vtknetcdf_SOURCE_DIR}/vtknetcdf/include
+- ${vtknetcdf_BINARY_DIR}/vtknetcdf
+- )
++if(NOT VTK_USE_SYSTEM_NETCDF)
++ set(vtknetcdf_LIBRARIES vtkNetCDF vtkNetCDF_cxx)
++ set(vtknetcdf_INCLUDE_DIRS
++ ${vtknetcdf_SOURCE_DIR}/vtknetcdf/include
++ ${vtknetcdf_BINARY_DIR}/vtknetcdf
++ )
++ add_subdirectory(vtknetcdf)
++else(NOT VTK_USE_SYSTEM_NETCDF)
++ set(vtknetcdf_LIBRARIES netcdf)
++endif()
+ vtk_module_export_info()
+-add_subdirectory(vtknetcdf)
+diff -up VTK/ThirdParty/netcdf/vtk_netcdfcpp.h.system VTK/ThirdParty/netcdf/vtk_netcdfcpp.h
+--- VTK/ThirdParty/netcdf/vtk_netcdfcpp.h.system 2012-12-03 08:31:39.000000000 -0700
++++ VTK/ThirdParty/netcdf/vtk_netcdfcpp.h 2012-12-06 09:58:22.810749439 -0700
+@@ -16,6 +16,6 @@
+ #define __vtk_netcdfcpp_h
+
+ /* Use the netcdf library configured for VTK. */
+-#include <vtknetcdf/cxx/netcdfcpp.h>
++#include <netcdfcpp.h>
+
+ #endif
+diff -up VTK/ThirdParty/netcdf/vtk_netcdf.h.system VTK/ThirdParty/netcdf/vtk_netcdf.h
+--- VTK/ThirdParty/netcdf/vtk_netcdf.h.system 2012-12-03 08:31:39.000000000 -0700
++++ VTK/ThirdParty/netcdf/vtk_netcdf.h 2012-12-06 09:58:22.810749439 -0700
+@@ -16,6 +16,6 @@
+ #define __vtk_netcdf_h
+
+ /* Use the netcdf library configured for VTK. */
+-#include <vtknetcdf/include/netcdf.h>
++#include <netcdf.h>
+
+ #endif
diff --git a/vtk-6.0.0-system.patch b/vtk-6.0.0-system.patch
new file mode 100644
index 0000000..7beecbc
--- /dev/null
+++ b/vtk-6.0.0-system.patch
@@ -0,0 +1,27 @@
+diff -up VTK/CMakeLists.txt.system VTK/CMakeLists.txt
+--- VTK/CMakeLists.txt.system 2012-12-03 08:31:29.000000000 -0700
++++ VTK/CMakeLists.txt 2012-12-06 09:58:22.809749444 -0700
+@@ -97,6 +97,11 @@ set(VTK_INSTALL_INCLUDE_DIR_CM24 ${VTK_I
+ set(VTK_INSTALL_DOXYGEN_DIR_CM24 ${VTK_INSTALL_DATA_DIR}/doxygen)
+
+ #-----------------------------------------------------------------------------
++# Do we try to use system libraries by default?
++OPTION(VTK_USE_SYSTEM_LIBRARIES "Use the system's libraries by default." OFF)
++MARK_AS_ADVANCED(VTK_USE_SYSTEM_LIBRARIES)
++
++#-----------------------------------------------------------------------------
+ # The third party macros are still used in one or two third party builds.
+ include(vtkThirdParty)
+
+diff -up VTK/CMake/vtkModuleMacros.cmake.system VTK/CMake/vtkModuleMacros.cmake
+--- VTK/CMake/vtkModuleMacros.cmake.system 2012-12-03 08:31:29.000000000 -0700
++++ VTK/CMake/vtkModuleMacros.cmake 2012-12-06 09:58:22.810749439 -0700
+@@ -563,7 +563,7 @@ macro(vtk_module_third_party _pkg)
+ message(FATAL_ERROR "Cannot specify both LIBRARIES and NO_LIBRARIES")
+ endif()
+
+- option(VTK_USE_SYSTEM_${_upper} "Use system-installed ${_pkg}" OFF)
++ option(VTK_USE_SYSTEM_${_upper} "Use system-installed ${_pkg}" ${VTK_USE_SYSTEM_LIBRARIES})
+ mark_as_advanced(VTK_USE_SYSTEM_${_upper})
+
+ if(VTK_USE_SYSTEM_${_upper})
More information about the scm-commits
mailing list