From 1747f4db09acbabe7eb445486b3940c7e4dbeb9d Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion(a)cora.nwra.com>
Date: Tue, 27 Jan 2015 21:16:47 -0700
Subject: Update to 4.3.1
diff --git a/.gitignore b/.gitignore
index 18d5a9d..aa5b076 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@ ParaView-3.8.1.tar.gz
/ParaView-v4.1.0-source.tar.gz
/ParaView-v4.2.0-RC1-source.tar.gz
/ParaView-v4.2.0-source.tar.gz
+/ParaView-v4.3.1-source.tar.gz
diff --git a/paraview-headers.patch b/paraview-headers.patch
index d60e39c..f7f8b96 100644
--- a/paraview-headers.patch
+++ b/paraview-headers.patch
@@ -1,5 +1,6 @@
---- ParaView-v4.1.0/ParaViewCore/ServerImplementation/Core/CMakeLists.txt 2014-01-11
14:59:57.000000000 +0100
-+++ ParaView-v4.1.0/ParaViewCore/ServerImplementation/Core/CMakeLists.txt 2014-07-06
12:25:09.877864172 +0200
+diff -up
ParaView-v4.3.1-source/ParaViewCore/ServerImplementation/Core/CMakeLists.txt.headers
ParaView-v4.3.1-source/ParaViewCore/ServerImplementation/Core/CMakeLists.txt
+---
ParaView-v4.3.1-source/ParaViewCore/ServerImplementation/Core/CMakeLists.txt.headers 2015-01-14
06:07:33.000000000 -0700
++++
ParaView-v4.3.1-source/ParaViewCore/ServerImplementation/Core/CMakeLists.txt 2015-01-27
21:01:32.091794869 -0700
@@ -77,7 +77,8 @@ set_source_files_properties(
set (${vtk-module}_HDRS
${CMAKE_CURRENT_SOURCE_DIR}/vtkSMMessageMinimal.h
@@ -10,11 +11,12 @@
#------------------------------------------------------------------------------
# Generate the protbuf message file.
---- ParaView-v4.1.0/ParaViewCore/VTKExtensions/Default/CMakeLists.txt 2014-01-11
14:59:57.000000000 +0100
-+++ ParaView-v4.1.0/ParaViewCore/VTKExtensions/Default/CMakeLists.txt 2014-07-06
11:53:38.924939100 +0200
-@@ -144,6 +144,11 @@ set(Module_SRCS
- vtkXMLPVDWriter.cxx
- )
+diff -up ParaView-v4.3.1-source/ParaViewCore/VTKExtensions/Default/CMakeLists.txt.headers
ParaView-v4.3.1-source/ParaViewCore/VTKExtensions/Default/CMakeLists.txt
+---
ParaView-v4.3.1-source/ParaViewCore/VTKExtensions/Default/CMakeLists.txt.headers 2015-01-27
21:01:32.091794869 -0700
++++ ParaView-v4.3.1-source/ParaViewCore/VTKExtensions/Default/CMakeLists.txt 2015-01-27
21:03:01.775623639 -0700
+@@ -147,6 +147,11 @@ if ("${VTK_RENDERING_BACKEND}" STREQUAL
+ )
+ endif()
+# Add header-only files so they get installed correctly.
+set (${vtk-module}_HDRS
@@ -24,9 +26,10 @@
set_source_files_properties(
vtkAMRDualGridHelper
vtkMaterialInterfaceCommBuffer
---- ParaView-v4.1.0/VTK/IO/Exodus/CMakeLists.txt 2014-01-11 15:02:07.000000000 +0100
-+++ ParaView-v4.1.0/VTK/IO/Exodus/CMakeLists.txt 2014-07-06 11:52:12.459942526 +0200
-@@ -24,6 +24,7 @@ set_source_files_properties(
+diff -up ParaView-v4.3.1-source/VTK/IO/Exodus/CMakeLists.txt.headers
ParaView-v4.3.1-source/VTK/IO/Exodus/CMakeLists.txt
+--- ParaView-v4.3.1-source/VTK/IO/Exodus/CMakeLists.txt.headers 2015-01-14
06:08:04.000000000 -0700
++++ ParaView-v4.3.1-source/VTK/IO/Exodus/CMakeLists.txt 2015-01-27 21:01:32.091794869
-0700
+@@ -23,6 +23,7 @@ set_source_files_properties(
set(vtkIOExodus_HDRS
vtkCPExodusIINodalCoordinatesTemplate.h
vtkCPExodusIIResultsArrayTemplate.h
@@ -34,8 +37,9 @@
)
---- ParaView-v4.1.0/VTK/IO/Import/CMakeLists.txt 2014-01-11 15:02:08.000000000 +0100
-+++ ParaView-v4.1.0/VTK/IO/Import/CMakeLists.txt 2014-07-06 11:50:27.924946668 +0200
+diff -up ParaView-v4.3.1-source/VTK/IO/Import/CMakeLists.txt.headers
ParaView-v4.3.1-source/VTK/IO/Import/CMakeLists.txt
+--- ParaView-v4.3.1-source/VTK/IO/Import/CMakeLists.txt.headers 2015-01-14
06:08:04.000000000 -0700
++++ ParaView-v4.3.1-source/VTK/IO/Import/CMakeLists.txt 2015-01-27 21:01:32.092794890
-0700
@@ -4,6 +4,10 @@ set(Module_SRCS
vtkVRMLImporter.cxx
)
diff --git a/paraview.spec b/paraview.spec
index 1d723ec..4587a2f 100644
--- a/paraview.spec
+++ b/paraview.spec
@@ -4,8 +4,8 @@
%{!?build_openmpi:%global build_openmpi 1}
%{!?build_mpich:%global build_mpich 1}
%global pv_maj 4
-%global pv_min 2
-%global pv_patch 0
+%global pv_min 3
+%global pv_patch 1
%global pv_majmin %{pv_maj}.%{pv_min}
%global rcver %{nil}
@@ -22,7 +22,7 @@
Name: paraview
Version: %{pv_majmin}.%{pv_patch}
-Release: 3%{?dist}
+Release: 1%{?dist}
Summary: Parallel visualization application
Group: Applications/Engineering
@@ -31,8 +31,6 @@ URL:
http://www.paraview.org/
Source0:
http://www.paraview.org/files/v%{pv_majmin}/ParaView-v%{version}%{?rcver}...
Source1: paraview_22x22.png
Source2: paraview.xml
-#Patch to vtk (from vtk package) to use system libraries
-Patch1: vtk-6.1.0-system.patch
#
http://www.vtk.org/Bug/view.php?id=15249
Patch2: vtk-type.patch
# Patch to vtk to use system netcdf library
@@ -257,7 +255,6 @@ developing applications that use %{name}-mpich.
%prep
%setup -q -n ParaView-v%{version}%{rcver}-source
-%patch1 -p0 -b .system
%patch2 -p0 -b .type
%patch3 -p0 -b .netcdf
%patch5 -p1 -b .headers
@@ -513,6 +510,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &>
/dev/null || :
%changelog
+* Tue Jan 27 2015 Orion Poplawski <orion(a)cora.nwra.com> - 4.3.1-1
+- Update to 4.3.1
+
* Tue Jan 27 2015 Petr Machata <pmachata(a)redhat.com> - 4.2.0-3
- Rebuild for boost 1.57.0
diff --git a/sources b/sources
index 27856ad..5512bd9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-77cf0e3804eb7bb91d2d94b10bd470f4 ParaView-v4.2.0-source.tar.gz
+d03d3ab504037edd21306413dff64293 ParaView-v4.3.1-source.tar.gz
diff --git a/vtk-6.1.0-system.patch b/vtk-6.1.0-system.patch
deleted file mode 100644
index c75d544..0000000
--- a/vtk-6.1.0-system.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-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)
-
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/paraview.git/commit/?h=epel7&id=17...