diff --git a/.gitignore b/.gitignore index 72427c9..db02523 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ ParaView-3.8.1.tar.gz /ParaView-3.98.0-src.tgz /ParaView-3.98.1-source.tar.gz /ParaView-v4.0.1-source.tgz +/ParaView-v4.1.0-RC2-source.tar.gz diff --git a/paraview.spec b/paraview.spec index 3e0bff1..5a22bba 100644 --- a/paraview.spec +++ b/paraview.spec @@ -4,34 +4,34 @@ %{!?build_openmpi:%global build_openmpi 1} %{!?build_mpich:%global build_mpich 1} %global pv_maj 4 -%global pv_min 0 -%global pv_patch 1 +%global pv_min 1 +%global pv_patch 0 %global pv_majmin %{pv_maj}.%{pv_min} -%global rcver %{nil} +%global rcver -RC2 %{!?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: 3%{?dist} +Release: 0.1.rc2%{?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-v%{version}%{?rcver}-source.tgz +Source0: http://www.paraview.org/files/v%{pv_majmin}/ParaView-v%{version}%{?rcver}-source.tar.gz Source1: paraview_22x22.png Source2: paraview.xml # 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 -Patch1: vtk-6.0.0-system.patch +Patch1: vtk-6.1.0-system.patch # Capitalize Protobuf so it finds FindProtobuf.cmake # http://paraview.org/Bug/view.php?id=13656 Patch2: paraview-4.0.1-Protobuf.patch #Patch to vtk to use system netcdf library -Patch3: vtk-6.0.0-netcdf.patch +Patch3: vtk-6.1.0-netcdf.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -234,21 +234,20 @@ developing applications that use %{name}-mpich. %prep -%setup -q -n ParaView-v%{version}%{rcver}-source -%patch0 -p1 -b .install +%setup -q -n ParaView-v%{version}%{rcver} %patch1 -p0 -b .system %patch2 -p1 -b .Protobuf %patch3 -p0 -b .netcdf # Install python properly sed -i -s '/VTK_INSTALL_PYTHON_USING_CMAKE/s/TRUE/FALSE/' CMakeLists.txt #Remove included thirdparty sources just to be sure -for x in autobahn vtkmpi4py vtkprotobuf twisted zope +for x in vtkmpi4py vtkprotobuf do rm -r ThirdParty/*/${x} done -for x in expat freetype gl2ps hdf5 jpeg libxml2 netcdf oggtheora png sqlite tiff zlib +for x in autobahn vtkexpat vtkfreetype vtkgl2ps vtkhdf5 vtkjpeg vtklibxml2 vtknetcdf vtkoggtheora vtkpng vtksqlite vtktiff twisted vtkzlib zope do - rm -r VTK/ThirdParty/${x}/vtk${x} + rm -r VTK/ThirdParty/*/${x} done # We want to build with a system vtk someday, but it doesn't work yet #rm -r VTK @@ -459,6 +458,9 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %changelog +* Fri Dec 27 2013 Orion Poplawski - 4.1.0-0.1.rc2 +- Update to 4.1.0-RC2 + * Fri Oct 18 2013 Orion Poplawski - 4.0.1-3 - Require vtk-devel for vtkProcessShader diff --git a/sources b/sources index 9163a0b..e09d112 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6a300744eaf32676a3a7e1b42eb642c7 ParaView-v4.0.1-source.tgz +aeba1acfadb3b202ea9842df56393a19 ParaView-v4.1.0-RC2-source.tar.gz diff --git a/vtk-6.0.0-netcdf.patch b/vtk-6.0.0-netcdf.patch deleted file mode 100644 index df0ef94..0000000 --- a/vtk-6.0.0-netcdf.patch +++ /dev/null @@ -1,75 +0,0 @@ -diff -up VTK/IO/NetCDF/CMakeLists.txt.netcdf VTK/IO/NetCDF/CMakeLists.txt ---- VTK/IO/NetCDF/CMakeLists.txt.netcdf 2013-01-28 14:44:35.000000000 -0700 -+++ VTK/IO/NetCDF/CMakeLists.txt 2013-01-28 15:40:00.825176295 -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.netcdf VTK/IO/ParallelNetCDF/CMakeLists.txt ---- VTK/IO/ParallelNetCDF/CMakeLists.txt.netcdf 2013-01-28 14:44:35.000000000 -0700 -+++ VTK/IO/ParallelNetCDF/CMakeLists.txt 2013-01-28 15:40:00.825176295 -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.netcdf VTK/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt ---- VTK/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt.netcdf 2013-01-28 14:44:36.000000000 -0700 -+++ VTK/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt 2013-01-28 15:40:27.534030910 -0700 -@@ -241,7 +241,7 @@ ENDIF(APPLE) - - - VTK_ADD_LIBRARY(vtkexoIIc ${cbind_SRCS}) --TARGET_LINK_LIBRARIES(vtkexoIIc vtkNetCDF) -+TARGET_LINK_LIBRARIES(vtkexoIIc netcdf) - - #INCLUDE (${CMAKE_ROOT}/Modules/Dart.cmake) - -diff -up VTK/ThirdParty/netcdf/CMakeLists.txt.netcdf VTK/ThirdParty/netcdf/CMakeLists.txt ---- VTK/ThirdParty/netcdf/CMakeLists.txt.netcdf 2013-01-28 14:44:36.000000000 -0700 -+++ VTK/ThirdParty/netcdf/CMakeLists.txt 2013-01-28 15:40:00.825176295 -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.netcdf VTK/ThirdParty/netcdf/vtk_netcdfcpp.h ---- VTK/ThirdParty/netcdf/vtk_netcdfcpp.h.netcdf 2013-01-28 14:44:36.000000000 -0700 -+++ VTK/ThirdParty/netcdf/vtk_netcdfcpp.h 2013-01-28 15:40:00.826176289 -0700 -@@ -16,6 +16,6 @@ - #define __vtk_netcdfcpp_h - - /* Use the netcdf library configured for VTK. */ --#include -+#include - - #endif -diff -up VTK/ThirdParty/netcdf/vtk_netcdf.h.netcdf VTK/ThirdParty/netcdf/vtk_netcdf.h ---- VTK/ThirdParty/netcdf/vtk_netcdf.h.netcdf 2013-01-28 14:44:36.000000000 -0700 -+++ VTK/ThirdParty/netcdf/vtk_netcdf.h 2013-01-28 15:40:00.826176289 -0700 -@@ -16,6 +16,6 @@ - #define __vtk_netcdf_h - - /* Use the netcdf library configured for VTK. */ --#include -+#include - - #endif diff --git a/vtk-6.0.0-system.patch b/vtk-6.0.0-system.patch deleted file mode 100644 index 7beecbc..0000000 --- a/vtk-6.0.0-system.patch +++ /dev/null @@ -1,27 +0,0 @@ -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}) diff --git a/vtk-6.1.0-netcdf.patch b/vtk-6.1.0-netcdf.patch new file mode 100644 index 0000000..d7d0cfa --- /dev/null +++ b/vtk-6.1.0-netcdf.patch @@ -0,0 +1,31 @@ +diff -up VTK/IO/NetCDF/CMakeLists.txt.netcdf VTK/IO/NetCDF/CMakeLists.txt +diff -up VTK/IO/ParallelNetCDF/CMakeLists.txt.netcdf VTK/IO/ParallelNetCDF/CMakeLists.txt +diff -up VTK/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt.netcdf VTK/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt +diff -up VTK/ThirdParty/netcdf/CMakeLists.txt.netcdf VTK/ThirdParty/netcdf/CMakeLists.txt +--- VTK/ThirdParty/netcdf/CMakeLists.txt.netcdf 2013-12-27 20:29:11.644289659 -0700 ++++ VTK/ThirdParty/netcdf/CMakeLists.txt 2013-12-27 20:33:48.071895769 -0700 +@@ -1,10 +1,17 @@ +-vtk_module_third_party(NetCDF +- LIBRARIES vtkNetCDF vtkNetCDF_cxx +- INCLUDE_DIRS +- ${CMAKE_CURRENT_SOURCE_DIR}/vtknetcdf/include +- ${CMAKE_CURRENT_BINARY_DIR}/vtknetcdf +- COMPONENTS C CXX +- ) ++if(NOT VTK_USE_SYSTEM_NETCDF) ++ vtk_module_third_party(NetCDF ++ LIBRARIES vtkNetCDF vtkNetCDF_cxx ++ INCLUDE_DIRS ++ ${CMAKE_CURRENT_SOURCE_DIR}/vtknetcdf/include ++ ${CMAKE_CURRENT_BINARY_DIR}/vtknetcdf ++ COMPONENTS C CXX ++ ) ++else(NOT VTK_USE_SYSTEM_NETCDF) ++ vtk_module_third_party(NetCDF ++ LIBRARIES vtkNetCDF netcdf ++ COMPONENTS C CXX ++endif() ++ + + #Configure the top cpp header to switch between system and internal + #netcdf just like vtk_module_third_party does for the c header. diff --git a/vtk-6.1.0-system.patch b/vtk-6.1.0-system.patch new file mode 100644 index 0000000..c75d544 --- /dev/null +++ b/vtk-6.1.0-system.patch @@ -0,0 +1,27 @@ +diff -up VTK/CMake/vtkModuleMacros.cmake.system VTK/CMake/vtkModuleMacros.cmake +--- VTK/CMake/vtkModuleMacros.cmake.system 2013-12-24 19:17:43.000000000 -0700 ++++ VTK/CMake/vtkModuleMacros.cmake 2013-12-27 20:28:22.375573277 -0700 +@@ -682,7 +682,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}) +diff -up VTK/CMakeLists.txt.system VTK/CMakeLists.txt +--- VTK/CMakeLists.txt.system 2013-12-27 20:28:22.374573241 -0700 ++++ VTK/CMakeLists.txt 2013-12-27 20:28:48.118669708 -0700 +@@ -132,6 +132,11 @@ if (CMAKE_CROSSCOMPILING AND NOT COMPILE + endif() + + #----------------------------------------------------------------------------- ++# 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) +