The package rpms/paraview.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/paraview.git/commit/?id=973f42cb1f93... https://src.fedoraproject.org/cgit/rpms/paraview.git/commit/?id=66456619fe3e... https://src.fedoraproject.org/cgit/rpms/paraview.git/commit/?id=13a3655eb4d4....
Change: +%ifarch ppc64le +%ifarch ppc64le %{arm} +%ifarch ppc64le
Thanks.
Full change: ============
commit 973f42cb1f932e118e8d5708e946840967c5c370 Author: Orion Poplawski orion@nwra.com Date: Sat Feb 29 12:13:56 2020 -0700
Use -g1 on arm to reduce memory usage; Fix requires exclude
diff --git a/paraview.spec b/paraview.spec index 91ef3ea..112b2a7 100644 --- a/paraview.spec +++ b/paraview.spec @@ -222,9 +222,9 @@ Provides: bundled(xdmf2) # Do not require anything provided in paraview's library directory # This list needs to be maintained by hand %if %{with protobuf} -%global __requires_exclude ^lib(IceT|QtTesting|vtk).*$ +%global __requires_exclude ^lib(IceT|pq|QtTesting|vtk).*$ %else -%global __requires_exclude ^lib(IceT|QtTesting|vtk|protobuf).*$ +%global __requires_exclude ^lib(IceT|pq|QtTesting|vtk|protobuf).*$ %endif
@@ -239,6 +239,7 @@ Provides: bundled(xdmf2)
%global paraview_cmake_options \\ -DCMAKE_BUILD_TYPE=RelWithDebInfo \\ + -DCMAKE_CXX_FLAGS_RELWITHDEBINFO:STRING="-DNDEBUG" \\ -DOpenGL_GL_PREFERENCE=GLVND \\ -DPARAVIEW_VERSIONED_INSTALL:BOOL=OFF \\ -DPARAVIEW_ENABLE_PYTHON:BOOL=ON \\ @@ -494,8 +495,12 @@ cp %SOURCE2 VTK/CMake/FindPEGTL.cmake #rm -r VTK
%build -%ifarch ppc64le %{arm} -%global _smp_mflags -j1 +# Try to limit memory consumption on some arches +%ifarch %{arm} +%global optflags %(echo %{optflags} | sed 's/-g /-g1 /') +%endif +%ifarch ppc64le +%global _smp_mflags -j2 %endif mkdir %{_target_platform} pushd %{_target_platform}
commit 66456619fe3ed13264e51129e6a9694fd8657239 Author: Orion Poplawski orion@nwra.com Date: Thu Feb 27 21:29:13 2020 -0700
Try to aviod memory exhaustion on arm as well
diff --git a/paraview.spec b/paraview.spec index 53af32d..91ef3ea 100644 --- a/paraview.spec +++ b/paraview.spec @@ -494,7 +494,7 @@ cp %SOURCE2 VTK/CMake/FindPEGTL.cmake #rm -r VTK
%build -%ifarch ppc64le +%ifarch ppc64le %{arm} %global _smp_mflags -j1 %endif mkdir %{_target_platform}
commit 13a3655eb4d4630e28e9b39e20c8c25f60d3b463 Author: Orion Poplawski orion@nwra.com Date: Sun Oct 6 15:58:22 2019 -0600
Update to 5.8.0
diff --git a/.gitignore b/.gitignore index 50be066..be854db 100644 --- a/.gitignore +++ b/.gitignore @@ -36,3 +36,5 @@ ParaView-3.8.1.tar.gz /ParaView-v5.5.1.tar.gz /ParaView-v5.5.2.tar.gz /ParaView-v5.6.0.tar.gz +/ParaView-v5.7.0.tar.gz +/ParaView-v5.8.0.tar.gz diff --git a/5883.patch b/5883.patch deleted file mode 100644 index f7489ce..0000000 --- a/5883.patch +++ /dev/null @@ -1,176 +0,0 @@ -From 257b9d7b18d5f3db3fe099dc18f230e23f7dfbab Mon Sep 17 00:00:00 2001 -From: David Gobbi david.gobbi@gmail.com -Date: Tue, 20 Aug 2019 17:02:24 -0600 -Subject: [PATCH] Compatibility for Python 3.8 - -The PyTypeObject struct was modified in Python 3.8, this change is -required to avoid compile errors. ---- - .../PythonInterpreter/vtkPythonStdStreamCaptureHelper.h | 6 ++++++ - Wrapping/PythonCore/PyVTKMethodDescriptor.cxx | 2 +- - Wrapping/PythonCore/PyVTKNamespace.cxx | 2 +- - Wrapping/PythonCore/PyVTKReference.cxx | 8 ++++---- - Wrapping/PythonCore/PyVTKTemplate.cxx | 2 +- - Wrapping/PythonCore/vtkPythonCompatibility.h | 8 +++++++- - Wrapping/Tools/vtkWrapPythonClass.c | 2 +- - Wrapping/Tools/vtkWrapPythonEnum.c | 2 +- - Wrapping/Tools/vtkWrapPythonType.c | 2 +- - 9 files changed, 23 insertions(+), 11 deletions(-) - -diff --git a/VTK/Utilities/PythonInterpreter/vtkPythonStdStreamCaptureHelper.h b/VTK/Utilities/PythonInterpreter/vtkPythonStdStreamCaptureHelper.h -index b1c12c83de..14ccfbe928 100644 ---- a/VTK/Utilities/PythonInterpreter/vtkPythonStdStreamCaptureHelper.h -+++ b/VTK/Utilities/PythonInterpreter/vtkPythonStdStreamCaptureHelper.h -@@ -140,6 +140,12 @@ static PyTypeObject vtkPythonStdStreamCaptureHelperType = { - #if PY_VERSION_HEX >= 0x03040000 - 0, // tp_finalize - #endif -+#if PY_VERSION_HEX >= 0x03080000 -+ 0, // tp_vectorcall -+#if PY_VERSION_HEX < 0x03090000 -+ 0, // tp_print -+#endif -+#endif - }; - - static PyObject* vtkWrite(PyObject* self, PyObject* args) -diff --git a/VTK/Wrapping/PythonCore/PyVTKMethodDescriptor.cxx b/VTK/Wrapping/PythonCore/PyVTKMethodDescriptor.cxx -index 2b0d443537..3840038498 100644 ---- a/VTK/Wrapping/PythonCore/PyVTKMethodDescriptor.cxx -+++ b/VTK/Wrapping/PythonCore/PyVTKMethodDescriptor.cxx -@@ -186,7 +186,7 @@ PyTypeObject PyVTKMethodDescriptor_Type = { - sizeof(PyMethodDescrObject), // tp_basicsize - 0, // tp_itemsize - PyVTKMethodDescriptor_Delete, // tp_dealloc -- nullptr, // tp_print -+ 0, // tp_vectorcall_offset - nullptr, // tp_getattr - nullptr, // tp_setattr - nullptr, // tp_compare -diff --git a/VTK/Wrapping/PythonCore/PyVTKNamespace.cxx b/VTK/Wrapping/PythonCore/PyVTKNamespace.cxx -index 71ee2a3516..5cf5bfbe6b 100644 ---- a/VTK/Wrapping/PythonCore/PyVTKNamespace.cxx -+++ b/VTK/Wrapping/PythonCore/PyVTKNamespace.cxx -@@ -49,7 +49,7 @@ PyTypeObject PyVTKNamespace_Type = { - 0, // tp_basicsize - 0, // tp_itemsize - PyVTKNamespace_Delete, // tp_dealloc -- nullptr, // tp_print -+ 0, // tp_vectorcall_offset - nullptr, // tp_getattr - nullptr, // tp_setattr - nullptr, // tp_compare -diff --git a/VTK/Wrapping/PythonCore/PyVTKReference.cxx b/VTK/Wrapping/PythonCore/PyVTKReference.cxx -index 943ac71080..b7104091c0 100644 ---- a/VTK/Wrapping/PythonCore/PyVTKReference.cxx -+++ b/VTK/Wrapping/PythonCore/PyVTKReference.cxx -@@ -1010,7 +1010,7 @@ PyTypeObject PyVTKReference_Type = { - sizeof(PyVTKReference), // tp_basicsize - 0, // tp_itemsize - PyVTKReference_Delete, // tp_dealloc -- nullptr, // tp_print -+ 0, // tp_vectorcall_offset - nullptr, // tp_getattr - nullptr, // tp_setattr - nullptr, // tp_compare -@@ -1067,7 +1067,7 @@ PyTypeObject PyVTKNumberReference_Type = { - sizeof(PyVTKReference), // tp_basicsize - 0, // tp_itemsize - PyVTKReference_Delete, // tp_dealloc -- nullptr, // tp_print -+ 0, // tp_vectorcall_offset - nullptr, // tp_getattr - nullptr, // tp_setattr - nullptr, // tp_compare -@@ -1124,7 +1124,7 @@ PyTypeObject PyVTKStringReference_Type = { - sizeof(PyVTKReference), // tp_basicsize - 0, // tp_itemsize - PyVTKReference_Delete, // tp_dealloc -- nullptr, // tp_print -+ 0, // tp_vectorcall_offset - nullptr, // tp_getattr - nullptr, // tp_setattr - nullptr, // tp_compare -@@ -1181,7 +1181,7 @@ PyTypeObject PyVTKTupleReference_Type = { - sizeof(PyVTKReference), // tp_basicsize - 0, // tp_itemsize - PyVTKReference_Delete, // tp_dealloc -- nullptr, // tp_print -+ 0, // tp_vectorcall_offset - nullptr, // tp_getattr - nullptr, // tp_setattr - nullptr, // tp_compare -diff --git a/VTK/Wrapping/PythonCore/PyVTKTemplate.cxx b/VTK/Wrapping/PythonCore/PyVTKTemplate.cxx -index be200985b3..340fe7953b 100644 ---- a/VTK/Wrapping/PythonCore/PyVTKTemplate.cxx -+++ b/VTK/Wrapping/PythonCore/PyVTKTemplate.cxx -@@ -268,7 +268,7 @@ PyTypeObject PyVTKTemplate_Type = { - 0, // tp_basicsize - 0, // tp_itemsize - nullptr, // tp_dealloc -- nullptr, // tp_print -+ 0, // tp_vectorcall_offset - nullptr, // tp_getattr - nullptr, // tp_setattr - nullptr, // tp_compare -diff --git a/VTK/Wrapping/PythonCore/vtkPythonCompatibility.h b/VTK/Wrapping/PythonCore/vtkPythonCompatibility.h -index 4a767844a6..be208faeef 100644 ---- a/VTK/Wrapping/PythonCore/vtkPythonCompatibility.h -+++ b/VTK/Wrapping/PythonCore/vtkPythonCompatibility.h -@@ -64,7 +64,13 @@ - #endif - - // PyTypeObject compatibility --#if PY_VERSION_HEX >= 0x03040000 -+#if PY_VERSION_HEX >= 0x03090000 -+#define VTK_WRAP_PYTHON_SUPPRESS_UNINITIALIZED \ -+ 0, 0, 0, 0, -+#elif PY_VERSION_HEX >= 0x03080000 -+#define VTK_WRAP_PYTHON_SUPPRESS_UNINITIALIZED \ -+ 0, 0, 0, 0, 0, -+#elif PY_VERSION_HEX >= 0x03040000 - #define VTK_WRAP_PYTHON_SUPPRESS_UNINITIALIZED \ - 0, 0, 0, - #else -diff --git a/VTK/Wrapping/Tools/vtkWrapPythonClass.c b/VTK/Wrapping/Tools/vtkWrapPythonClass.c -index b1e45f8e80..4d558ea081 100644 ---- a/VTK/Wrapping/Tools/vtkWrapPythonClass.c -+++ b/VTK/Wrapping/Tools/vtkWrapPythonClass.c -@@ -521,7 +521,7 @@ void vtkWrapPython_GenerateObjectType( - " sizeof(PyVTKObject), // tp_basicsize\n" - " 0, // tp_itemsize\n" - " PyVTKObject_Delete, // tp_dealloc\n" -- " nullptr, // tp_print\n" -+ " 0, // tp_vectorcall_offset\n" - " nullptr, // tp_getattr\n" - " nullptr, // tp_setattr\n" - " nullptr, // tp_compare\n" -diff --git a/VTK/Wrapping/Tools/vtkWrapPythonEnum.c b/VTK/Wrapping/Tools/vtkWrapPythonEnum.c -index b933702242..1249362854 100644 ---- a/VTK/Wrapping/Tools/vtkWrapPythonEnum.c -+++ b/VTK/Wrapping/Tools/vtkWrapPythonEnum.c -@@ -145,7 +145,7 @@ void vtkWrapPython_GenerateEnumType( - " sizeof(PyIntObject), // tp_basicsize\n" - " 0, // tp_itemsize\n" - " nullptr, // tp_dealloc\n" -- " nullptr, // tp_print\n" -+ " 0, // tp_vectorcall_offset\n" - " nullptr, // tp_getattr\n" - " nullptr, // tp_setattr\n" - " nullptr, // tp_compare\n" -diff --git a/VTK/Wrapping/Tools/vtkWrapPythonType.c b/VTK/Wrapping/Tools/vtkWrapPythonType.c -index 744cb1b9d3..0a1375e541 100644 ---- a/VTK/Wrapping/Tools/vtkWrapPythonType.c -+++ b/VTK/Wrapping/Tools/vtkWrapPythonType.c -@@ -709,7 +709,7 @@ void vtkWrapPython_GenerateSpecialType( - " sizeof(PyVTKSpecialObject), // tp_basicsize\n" - " 0, // tp_itemsize\n" - " Py%s_Delete, // tp_dealloc\n" -- " nullptr, // tp_print\n" -+ " 0, // tp_vectorcall_offset\n" - " nullptr, // tp_getattr\n" - " nullptr, // tp_setattr\n" - " nullptr, // tp_compare\n" --- -2.21.0 - diff --git a/paraview-cmakedir.patch b/paraview-cmakedir.patch new file mode 100644 index 0000000..f70792e --- /dev/null +++ b/paraview-cmakedir.patch @@ -0,0 +1,12 @@ +diff -up ParaView-v5.8.0/CMakeLists.txt.cmakedir ParaView-v5.8.0/CMakeLists.txt +--- ParaView-v5.8.0/CMakeLists.txt.cmakedir 2020-02-26 17:55:43.830906529 -0700 ++++ ParaView-v5.8.0/CMakeLists.txt 2020-02-26 18:05:08.407505870 -0700 +@@ -343,7 +343,7 @@ if (PARAVIEW_VERSIONED_INSTALL) + endif () + + set(paraview_cmake_destination +- "${CMAKE_INSTALL_LIBDIR}/cmake/paraview${paraview_version_suffix}") ++ "${CMAKE_INSTALL_CMAKEDIR}/paraview${paraview_version_suffix}") + + set(PARAVIEW_CUSTOM_LIBRARY_SUFFIX "<DEFAULT>" + CACHE STRING "Custom library file name suffix (defaults to the version number)") diff --git a/paraview-desktop.patch b/paraview-desktop.patch deleted file mode 100644 index fa59bb2..0000000 --- a/paraview-desktop.patch +++ /dev/null @@ -1,24 +0,0 @@ -From a512bb5c01b24f238d8053779a7ca124db064773 Mon Sep 17 00:00:00 2001 -From: Orion Poplawski orion@nwra.com -Date: Sat, 9 Mar 2019 15:20:42 -0700 -Subject: [PATCH] Allow paraview to work with "Open With" - ---- - Applications/ParaView/org.paraview.ParaView.desktop.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Applications/ParaView/org.paraview.ParaView.desktop.in b/Applications/ParaView/org.paraview.ParaView.desktop.in -index d1da219349..34338f6daa 100644 ---- a/Applications/ParaView/paraview.desktop.in -+++ b/Applications/ParaView/paraview.desktop.in -@@ -3,6 +3,6 @@ Version=1.0 - Type=Application - Name=ParaView - Comment=Parallel visualization application --Exec=paraview -+Exec=paraview %f - TryExec=paraview - Icon=paraview --- -2.18.1 - diff --git a/paraview-metainfo.patch b/paraview-metainfo.patch deleted file mode 100644 index 1d2e391..0000000 --- a/paraview-metainfo.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up ParaView-v5.6.0/Applications/ParaView/CMakeLists.txt.orig ParaView-v5.6.0/Applications/ParaView/CMakeLists.txt ---- ParaView-v5.6.0/Applications/ParaView/CMakeLists.txt.orig 2019-02-12 20:25:45.785665391 -0700 -+++ ParaView-v5.6.0/Applications/ParaView/CMakeLists.txt 2019-02-12 20:26:44.877398493 -0700 -@@ -164,6 +164,6 @@ elseif (UNIX) - endforeach () - install( - FILES paraview.appdata.xml -- DESTINATION share/appdata -+ DESTINATION share/metainfo - COMPONENT runtime) - endif() diff --git a/paraview-pegtl.patch b/paraview-pegtl.patch deleted file mode 100644 index 3dde917..0000000 --- a/paraview-pegtl.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up ParaView-v5.6.0/VTK/IO/MotionFX/vtkMotionFXCFGGrammar.h.pegtl ParaView-v5.6.0/VTK/IO/MotionFX/vtkMotionFXCFGGrammar.h ---- ParaView-v5.6.0/VTK/IO/MotionFX/vtkMotionFXCFGGrammar.h.pegtl 2018-11-06 12:05:18.000000000 -0700 -+++ ParaView-v5.6.0/VTK/IO/MotionFX/vtkMotionFXCFGGrammar.h 2019-02-06 20:04:55.642987394 -0700 -@@ -22,7 +22,7 @@ - #include <vtk_pegtl.h> - - // for debugging --#include <vtkpegtl/include/tao/pegtl/contrib/tracer.hpp> -+#include <tao/pegtl/contrib/tracer.hpp> - - namespace MotionFX - { diff --git a/paraview.spec b/paraview.spec index 06f8cf8..53af32d 100644 --- a/paraview.spec +++ b/paraview.spec @@ -1,7 +1,6 @@ # This package depends on automagic byte compilation # https://fedoraproject.org/wiki/Changes/No_more_automagic_Python_bytecompilat... %global _python_bytecompile_extra 1 -%global _target_platform %{_vendor}-%{_target_os}
%if 0%{?fedora} && 0%{?fedora} > 31 %define _legacy_common_support 1 @@ -10,10 +9,10 @@ %{!?build_openmpi:%global build_openmpi 1} %{!?build_mpich:%global build_mpich 1} %global pv_maj 5 -%global pv_min 6 +%global pv_min 8 %global pv_patch 0 %global pv_majmin %{pv_maj}.%{pv_min} -#global rcsuf rc3 +#global rcsuf -RC3 %{?rcsuf:%global relsuf .%{rcsuf}} %{?rcsuf:%global versuf -%{rcsuf}}
@@ -27,7 +26,7 @@ # VTK currently is carrying local modifications to gl2ps %bcond_with gl2ps %if !%{with gl2ps} -%global vtk_use_system_gl2ps -DVTK_USE_SYSTEM_GL2PS:BOOL=OFF +%global vtk_use_system_gl2ps -DVTK_MODULE_USE_EXTERNAL_VTK_gl2ps:BOOL=OFF %endif
# Default to Qt5 on Fedora and RHEL 8+ @@ -43,66 +42,57 @@ # We need jsoncpp >= 0.7 %if 0%{?fedora} || 0%{?rhel} >= 8 %global system_jsoncpp 1 -%global vtk_use_system_jsoncpp -DVTK_USE_SYSTEM_JSONCPP:BOOL=ON +%global vtk_use_system_jsoncpp -DVTK_MODULE_USE_EXTERNAL_VTK_jsoncpp:BOOL=ON %else %global system_jsoncpp 0 -%global vtk_use_system_jsoncpp -DVTK_USE_SYSTEM_JSONCPP:BOOL=OFF +%global vtk_use_system_jsoncpp -DVTK_MODULE_USE_EXTERNAL_VTK_jsoncpp:BOOL=OFF %endif
%bcond_without protobuf %if %{with protobuf} -%global vtk_use_system_protobuf -DVTK_USE_SYSTEM_PROTOBUF:BOOL=ON +%global vtk_use_system_protobuf -DVTK_MODULE_USE_EXTERNAL_ParaView_protobuf:BOOL=ON %else -%global vtk_use_system_protobuf -DVTK_USE_SYSTEM_PROTOBUF:BOOL=OFF +%global vtk_use_system_protobuf -DVTK_MODULE_USE_EXTERNAL_ParaView_protobuf:BOOL=OFF %endif
-# We need pugixml >= 1.4 +# We need pugixml >= 1.9 %if 0%{?fedora} || 0%{?rhel} >= 8 +# ParaView 5.7.0 disabled building with external pugixml %global system_pugixml 1 -%global vtk_use_system_pugixml -DVTK_USE_SYSTEM_PUGIXML:BOOL=ON +%global vtk_use_system_pugixml -DVTK_MODULE_USE_EXTERNAL_VTK_pugixml:BOOL=ON %else %global system_pugixml 0 -%global vtk_use_system_pugixml -DVTK_USE_SYSTEM_PUGIXML:BOOL=OFF +%global vtk_use_system_pugixml -DVTK_MODULE_USE_EXTERNAL_VTK_pugixml:BOOL=OFF %endif
Name: paraview Version: %{pv_majmin}.%{pv_patch} -Release: 16%{?relsuf}%{?dist} +Release: 1%{?relsuf}%{?dist} Summary: Parallel visualization application
License: BSD -URL: http://www.paraview.org/ -Source0: http://www.paraview.org/files/v%%7Bpv_majmin%7D/ParaView-v%%7Bversion%7D%%7B... +URL: https://www.paraview.org/ +Source0: https://www.paraview.org/files/v%%7Bpv_majmin%7D/ParaView-v%%7Bversion%7D%%7... Source1: paraview.xml Source2: FindPEGTL.cmake -# Use system pegtl -Patch0: paraview-pegtl.patch -# Fix appdata install location -# https://gitlab.kitware.com/paraview/paraview/merge_requests/3014 -Patch1: paraview-metainfo.patch -# Allow Open with... -# https://bugzilla.redhat.com/show_bug.cgi?id=1635276 -# https://gitlab.kitware.com/paraview/paraview/merge_requests/3103 -Patch2: paraview-desktop.patch -# Python 3.8 support -Patch3: https://gitlab.kitware.com/vtk/vtk/merge_requests/5883.patch -# Try to work around issues on wayland -# https://bugzilla.redhat.com/show_bug.cgi?id=1769060 -# https://gitlab.kitware.com/paraview/paraview/issues/19481 -Patch4: paraview-wayland.patch +# Fix cmake files install location +# https://gitlab.kitware.com/paraview/paraview/issues/19724 +Patch0: paraview-cmakedir.patch
BuildRequires: cmake3 -%if 0%{?rhel} && 0%{?rhel} <= 7 -BuildRequires: qt-assistant -%else -BuildRequires: qt-assistant-adp-devel -%endif +#if 0%{?rhel} && 0%{?rhel} <= 7 +#BuildRequires: qt-assistant +#else +#BuildRequires: qt-assistant-adp-devel +#endif BuildRequires: lz4-devel %if %{with qt5} BuildRequires: cmake(Qt5) +BuildRequires: cmake(Qt5Svg) BuildRequires: cmake(Qt5UiPlugin) BuildRequires: cmake(Qt5X11Extras) BuildRequires: qt5-qtwebkit-devel +BuildRequires: /usr/bin/xmlpatterns-qt5 %else BuildRequires: qt-devel BuildRequires: qt-webkit-devel @@ -151,14 +141,16 @@ BuildRequires: libjpeg-devel BuildRequires: libpng-devel BuildRequires: libtheora-devel BuildRequires: libxml2-devel +BuildRequires: libXt-devel BuildRequires: netcdf-cxx-devel BuildRequires: PEGTL-devel %if %{with protobuf} BuildRequires: protobuf-devel %endif %if %{system_pugixml} -BuildRequires: pugixml-devel >= 1.4 +BuildRequires: pugixml-devel >= 1.9 %endif +BuildRequires: utf8cpp-devel # For validating desktop and appdata files BuildRequires: desktop-file-utils %if 0%{?fedora} || 0%{?rhel} >= 8 @@ -169,6 +161,7 @@ BuildRequires: glibc-langpack-en Requires: hdf5%{?_hdf5_version: = %{_hdf5_version}} Requires: %{name}-data = %{version}-%{release} %if 0%{?fedora} || 0%{?rhel} >= 8 +#Recommends: python3-pygments Requires: python3-pygments Requires: python3-six Requires: python3-netcdf4 @@ -210,10 +203,14 @@ Provides: bundled(jsoncpp) = 0.7.0 %if !%{with protobuf} Provides: bundled(protobuf) = 2.3.0 %endif +%if !0%{system_pugixml} +Provides: bundled(pugixml) = 1.9 +%endif # Bundled vtk # https://bugzilla.redhat.com/show_bug.cgi?id=697842 Provides: bundled(vtk) = 6.3.0 Provides: bundled(diy2) +Provides: bundled(h5part) = 1.6.6 Provides: bundled(icet) Provides: bundled(libharu) Provides: bundled(libproj4) @@ -237,23 +234,15 @@ Provides: bundled(xdmf2) #-- Plugin: VaporPlugin - Plugin to read NCAR VDR files : Disabled - Requires vapor
# We want to build with a system vtk someday, but it doesn't work yet -# -DUSE_EXTERNAL_VTK:BOOL=ON \\ +# -DPARAVIEW_USE_EXTERNAL_VTK:BOOL=ON \\ # -DVTK_DIR=%%{_libdir}/vtk \\
%global paraview_cmake_options \\ -DCMAKE_BUILD_TYPE=RelWithDebInfo \\ -DOpenGL_GL_PREFERENCE=GLVND \\ - -DPARAVIEW_BUILD_PLUGIN_AdiosReader:BOOL=ON \\ + -DPARAVIEW_VERSIONED_INSTALL:BOOL=OFF \\ -DPARAVIEW_ENABLE_PYTHON:BOOL=ON \\ -%if %{with qt5} \ - -DPARAVIEW_QT_VERSION:STRING="5" \\ -%endif \ -%if %{with VisitBridge} \ - -DPARAVIEW_USE_VISITBRIDGE=ON \\ - -DVTK_USE_SYSTEM_VISITLIB:BOOL=OFF \\ - -DVISIT_BUILD_READER_CGNS=ON \\ -%endif \ - -DVTK_CUSTOM_LIBRARY_SUFFIX="" \\ + -DPARAVIEW_INSTALL_DEVELOPMENT_FILES:BOOL=ON \\ -DVTK_INSTALL_DATA_DIR=share/paraview \\ -DVTK_INSTALL_PACKAGE_DIR=share/cmake/paraview \\ %if 0%{?fedora} || 0%{?rhel} >= 8 \ @@ -262,17 +251,12 @@ Provides: bundled(xdmf2) -DVTK_PYTHON_VERSION=2 \\ %endif \ -DVTK_USE_OGGTHEORA_ENCODER:BOOL=ON \\ - -DVTK_USE_SYSTEM_LIBRARIES=ON \\ - -DVTK_USE_SYSTEM_HDF5=ON \\ + -DPARAVIEW_BUILD_WITH_EXTERNAL:BOOL=ON \\ %{?vtk_use_system_gl2ps} \\ %{?vtk_use_system_jsoncpp} \\ - -DVTK_USE_SYSTEM_NETCDF=ON \\ + -DVTK_MODULE_USE_EXTERNAL_VTK_libharu=OFF \\ %{?vtk_use_system_protobuf} \\ %{?vtk_use_system_pugixml} \\ - -DVTK_USE_SYSTEM_PYGMENTS:BOOL=ON \\ - -DVTK_USE_SYSTEM_QTTESTING=OFF \\ - -DVTK_USE_SYSTEM_XDMF2=OFF \\ - -DXDMF_WRAP_PYTHON:BOOL=ON \\ -DBUILD_EXAMPLES:BOOL=ON \\ -DBUILD_TESTING:BOOL=OFF \\ -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON @@ -280,23 +264,23 @@ Provides: bundled(xdmf2) %global paraview_cmake_mpi_options \\ -DCMAKE_PREFIX_PATH:PATH=$MPI_HOME \\ -DCMAKE_INSTALL_PREFIX:PATH=$MPI_HOME \\ + -DCMAKE_INSTALL_CMAKEDIR:PATH=lib/cmake \\ + -DCMAKE_INSTALL_INCLUDEDIR:PATH=../../include/$MPI_COMPILER/%{name} \\ + -DCMAKE_INSTALL_LIBDIR:PATH=lib/%{name} \\ -DHDF5_INCLUDE_DIRS:PATH=$MPI_INCLUDE \\ - -DINCLUDE_INSTALL_DIR:PATH=$MPI_INCLUDE/paraview \\ -DPYTHON_INSTALL_DIR=PATH=$MPI_PYTHON2_SITEARCH \\ - -DVTK_INSTALL_INCLUDE_DIR:PATH=$MPI_INCLUDE/paraview \\ - -DVTK_INSTALL_ARCHIVE_DIR:PATH=lib/paraview \\ - -DVTK_INSTALL_LIBRARY_DIR:PATH=lib/paraview \\ - -DVTK_USE_SYSTEM_DIY2=OFF \\ - -DVTK_USE_SYSTEM_ICET=OFF \\ - -DVTK_USE_SYSTEM_MPI4PY:BOOL=ON \\ - -DPARAVIEW_INSTALL_DEVELOPMENT_FILES:BOOL=ON \\ - -DQtTesting_INSTALL_LIB_DIR=lib/paraview \\ - -DQtTesting_INSTALL_CMAKE_DIR=lib/paraview/CMake \\ + -DVTK_INSTALL_INCLUDE_DIR:PATH=$MPI_INCLUDE/%{name} \\ + -DVTK_INSTALL_ARCHIVE_DIR:PATH=lib/%{name} \\ + -DVTK_INSTALL_LIBRARY_DIR:PATH=lib/%{name} \\ + -DVTK_MODULE_USE_EXTERNAL_VTK_diy2=OFF \\ + -DVTK_MODULE_USE_EXTERNAL_VTK_icet=OFF \\ + -DQtTesting_INSTALL_LIB_DIR=lib/%{name} \\ + -DQtTesting_INSTALL_CMAKE_DIR=lib/%{name}/CMake \\ -DPARAVIEW_USE_MPI:BOOL=ON \\ -DICET_BUILD_TESTING:BOOL=ON \\ %if %{with VisitBridge} \ -DPARAVIEW_USE_VISITBRIDGE=ON \\ - -DVTK_USE_SYSTEM_VISITLIB:BOOL=OFF \\ + -DVTK_MODULE_USE_EXTERNAL_ParaView_VisItLib:BOOL=OFF \\ -DVISIT_BUILD_READER_CGNS=ON \\ %endif \ %{paraview_cmake_options} @@ -475,7 +459,7 @@ developing applications that use %{name}-mpich.
%prep -%autosetup -n ParaView-v%{version}%{?versuf} -p 1 +%autosetup -p1 -n ParaView-v%{version}%{?versuf}
%if %{with VisitBridge} cp -p Utilities/VisItBridge/README.md Utilities/VisItBridge/README-VisItBridge.md @@ -487,13 +471,14 @@ rm -f Utilities/VisItBridge/databases/readers/Vs/VsStaggeredField.C # 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 vtkcgns %{?_with_protobuf:vtkprotobuf} vtkpygments +for x in vtkcgns %{?_with_protobuf:vtkprotobuf} do rm -r ThirdParty/*/${x} done %if %{system_pugixml} -rm ThirdParty/pugixml/pugixml.* +rm -r VTK/ThirdParty/pugixml/vtkpugixml %endif +# TODO - loguru for x in vtk{doubleconversion,eigen,expat,freetype,%{?_with_gl2ps:gl2ps,}glew,hdf5,jpeg,kissfft,libproj,libxml2,lz4,lzma,mpi4py,netcdf,ogg,pegtl,png,sqlite,theora,tiff,zfp,zlib} do rm -r VTK/ThirdParty/*/${x} @@ -509,25 +494,24 @@ cp %SOURCE2 VTK/CMake/FindPEGTL.cmake #rm -r VTK
%build +%ifarch ppc64le +%global _smp_mflags -j1 +%endif mkdir %{_target_platform} pushd %{_target_platform} %cmake3 -Wno-dev .. \ - -DBUILD_DOCUMENTATION:BOOL=ON \ - -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 \ - -DQtTesting_INSTALL_LIB_DIR=%{_lib}/paraview \ - -DQtTesting_INSTALL_CMAKE_DIR=%{_lib}/paraview/CMake \ + -DCMAKE_INSTALL_CMAKEDIR:PATH=%{_lib}/cmake \ + -DCMAKE_INSTALL_LIBDIR:PATH=%{_lib}/%{name} \ + -DPARAVIEW_BUILD_DEVELOPER_DOCUMENTATION:BOOL=ON \ + -DVTK_INSTALL_INCLUDE_DIR:PATH=include/%{name} \ + -DVTK_INSTALL_ARCHIVE_DIR:PATH=%{_lib}/%{name} \ + -DVTK_INSTALL_LIBRARY_DIR:PATH=%{_lib}/%{name} \ + -DQtTesting_INSTALL_LIB_DIR=%{_lib}/%{name} \ + -DQtTesting_INSTALL_CMAKE_DIR=%{_lib}/%{name}/CMake \ %{paraview_cmake_options} %make_build -#export LD_LIBRARY_PATH="%{buildroot}%{_libdir}:%{_libdir}" -#export PYTHONPATH="%{buildroot}%{_libdir}/%{name}/site-packages:${PYTHONPATH}" -#export PYTHONPATH="${PYTHONPATH%:}:%{python2_sitearch}/mpich" export LANG=en_US.UTF-8 -%make_build DoxygenDoc ParaViewDoc -#unset LD_LIBRARY_PATH -#unset PYTHONPATH +%make_build ParaViewDoxygenDoc ParaViewPythonDoc popd %if %{build_openmpi} mkdir %{_target_platform}-openmpi @@ -535,8 +519,6 @@ pushd %{_target_platform}-openmpi %{_openmpi_load} %cmake3 -Wno-dev .. \ %{paraview_cmake_mpi_options} -# Fixup forward paths -sed -i -e 's,../%{_lib}/openmpi,..,' `find -name *-forward.c` %make_build %{_openmpi_unload} popd @@ -550,8 +532,6 @@ pushd %{_target_platform}-mpich [ -z "$PYTHONPATH" ] && export PYTHONPATH=$MPI_PYTHON_SITEARCH %cmake3 -Wno-dev .. \ %{paraview_cmake_mpi_options} -# Fixup forward paths -sed -i -e 's,../%{_lib}/mpich,..,' `find -name *-forward.c` %make_build %{_mpich_unload} popd @@ -576,8 +556,6 @@ install -m644 %SOURCE1 %{buildroot}%{_datadir}/mime/packages #Remove mpi copy of doc and man pages and data rm -rf %{buildroot}%{_libdir}/openmpi/share/{metainfo,applications,doc,icons,man,mimeinfo,paraview,vtkm-*}
-# Fix shell script permissions -chmod 0755 %{buildroot}%{_libdir}/openmpi/share/cmake/paraview/pre-commit %{_openmpi_unload} %endif
@@ -590,35 +568,27 @@ chmod 0755 %{buildroot}%{_libdir}/openmpi/share/cmake/paraview/pre-commit #Remove mpi copy of doc and man pages and data rm -rf %{buildroot}%{_libdir}/mpich/share/{metainfo,applications,doc,icons,man,mimeinfo,paraview,vtkm-*}
-# Fix shell script permissions -chmod 0755 %{buildroot}%{_libdir}/mpich/share/cmake/paraview/pre-commit %{_mpich_unload} %endif
#Install the normal version %make_install -C %{_target_platform}
-desktop-file-validate %{buildroot}%{_datadir}/applications/paraview.desktop +desktop-file-validate %{buildroot}%{_datadir}/applications/org.paraview.ParaView.desktop %if 0%{?fedora} || 0%{?rhel} >= 8 -appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/*.appdata.xml +appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/org.paraview.ParaView.appdata.xml %endif
#Cleanup only vtk conflicting binaries -rm %{buildroot}%{_bindir}/vtk{LegacyColorMapXMLToJSON,ParseJava,Wrap{Hierarchy,Java,Python}}* +rm %{buildroot}%{_bindir}/vtk{ParseJava,Wrap{Hierarchy,Java,Python}}* rm -r %{buildroot}%{_datadir}/vtkm-*
-# Fix shell script permissions -chmod 0755 %{buildroot}%{_datadir}/cmake/paraview/pre-commit - -# Strip build dir from VTKConfig.cmake (bug #917425) -find %{buildroot} -name VTKConfig.cmake | xargs sed -i -e '/builddir/s/^/#/' - # Build autodocs and move documentation-files to proper location mkdir -p %{buildroot}%{_pkgdocdir} install -pm 0644 README.md %{buildroot}%{_pkgdocdir} install -pm 0644 Utilities/VisItBridge/README-VisItBridge.md %{buildroot}%{_pkgdocdir} -mv %{buildroot}%{_docdir}/paraview-%{pv_majmin}/* %{buildroot}%{_pkgdocdir} -rm -rf %{buildroot}%{_docdir}/paraview-%{pv_majmin} +mv %{buildroot}%{_docdir}/ParaView/* %{buildroot}%{_pkgdocdir} +rm -rf %{buildroot}%{_docdir}/ParaView find %{buildroot}%{_pkgdocdir} -name '.*' -print0 | xargs -0 rm -frv find %{buildroot}%{_pkgdocdir} -name '*.map' -or -name '*.md5' -print -delete hardlink -cfv %{buildroot}%{_pkgdocdir} @@ -656,6 +626,7 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
%files %{_bindir}/%{name} +%{_bindir}/%{name}.conf %{_bindir}/pvbatch # Currently disabled upstream #{_bindir}/pvblot @@ -672,35 +643,37 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %dir %{_pkgdocdir} %{_pkgdocdir}/README.md %{_pkgdocdir}/README-VisItBridge.md -%{_datadir}/metainfo/paraview.appdata.xml -%{_datadir}/applications/*paraview.desktop +%{_datadir}/metainfo/org.paraview.ParaView.appdata.xml +%{_datadir}/applications/org.paraview.ParaView.desktop %{_datadir}/icons/hicolor/*/apps/paraview.png +%license %{_datadir}/licenses/ParaView/ %{_datadir}/mime/packages/paraview.xml +%{_datadir}/%{name}/
%files devel %{_bindir}/paraview-config %{_bindir}/vtkWrapClientServer -%{_bindir}/vtkkwProcessXML +%{_bindir}/vtkProbeOpenGLVersion +%{_bindir}/vtkProcessXML %{_includedir}/%{name}/ -%{_datadir}/cmake/ +%{_libdir}/cmake/ %{_libdir}/%{name}/*.a
%files doc -%license %{_datadir}/licenses/%{name}* %{_pkgdocdir}
- %if %{build_openmpi} %files openmpi %{_libdir}/openmpi/bin/[ps]* %{_libdir}/openmpi/lib/%{name}/ %exclude %{_libdir}/openmpi/lib/%{name}/*.a +%{_libdir}/openmpi/share/licenses/
%files openmpi-devel %{_includedir}/openmpi-%{_arch}/%{name}/ %{_libdir}/openmpi/bin/vtk* +%{_libdir}/openmpi/lib/cmake/ %{_libdir}/openmpi/lib/%{name}/*.a -%{_libdir}/openmpi/share/cmake/ %endif
@@ -709,16 +682,20 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %{_libdir}/mpich/bin/[ps]* %{_libdir}/mpich/lib/%{name}/ %exclude %{_libdir}/mpich/lib/%{name}/*.a +%{_libdir}/mpich/share/licenses/
%files mpich-devel %{_includedir}/mpich-%{_arch}/%{name}/ %{_libdir}/mpich/bin/vtk* +%{_libdir}/mpich/lib/cmake/ %{_libdir}/mpich/lib/%{name}/*.a -%{_libdir}/mpich/share/cmake/ %endif
%changelog +* Thu Feb 27 2020 Orion Poplawski orion@nwra.com - 5.8.0-1 +- Update to 5.8.0 + * Mon Feb 17 2020 Sandro Mani manisandro@gmail.com - 5.6.0-16 - Rebuild (cgnslib)
diff --git a/sources b/sources index e30ce27..2530cd6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ParaView-v5.6.0.tar.gz) = 4d7c1b9f5781411cdd290a0ef105221deca1af28bb29b8e6e6c077f3377b110e7c86637c11514559d2d826d36f189d5b5c1caa9e5f9c53820cf35c3ade1ae1f6 +SHA512 (ParaView-v5.8.0.tar.gz) = 803ea432f5b56f7d1b3bade78b2b531312034e7e29eaec64c6e122792f8beedc7a61f458f2392550e9ecb0f5ff969c4b11a65f80d19ca32569341c84deedc8cb
commit 2b71dce8bfc5695eeab8369266583ecb540dca9f Author: sagitter sagitter@fedoraproject.org Date: Tue Feb 18 21:36:44 2020 +0100
Workaround for multiple definition errors with GCC-10
diff --git a/paraview.spec b/paraview.spec index 097185c..06f8cf8 100644 --- a/paraview.spec +++ b/paraview.spec @@ -3,6 +3,10 @@ %global _python_bytecompile_extra 1 %global _target_platform %{_vendor}-%{_target_os}
+%if 0%{?fedora} && 0%{?fedora} > 31 +%define _legacy_common_support 1 +%endif + %{!?build_openmpi:%global build_openmpi 1} %{!?build_mpich:%global build_mpich 1} %global pv_maj 5
commit 6e63d536fbb4347ae54852449bf2188c5a9bb91d Author: Sandro Mani manisandro@gmail.com Date: Mon Feb 17 14:45:09 2020 +0100
Rebuild (cgnslib)
diff --git a/paraview.spec b/paraview.spec index b746d06..097185c 100644 --- a/paraview.spec +++ b/paraview.spec @@ -63,7 +63,7 @@
Name: paraview Version: %{pv_majmin}.%{pv_patch} -Release: 15%{?relsuf}%{?dist} +Release: 16%{?relsuf}%{?dist} Summary: Parallel visualization application
License: BSD @@ -715,6 +715,9 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
%changelog +* Mon Feb 17 2020 Sandro Mani manisandro@gmail.com - 5.6.0-16 +- Rebuild (cgnslib) + * Wed Jan 29 2020 Fedora Release Engineering releng@fedoraproject.org - 5.6.0-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
commit 45858c098d8004fa909637749903e19c8fe4d809 Author: Fedora Release Engineering releng@fedoraproject.org Date: Wed Jan 29 20:54:39 2020 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
Signed-off-by: Fedora Release Engineering releng@fedoraproject.org
diff --git a/paraview.spec b/paraview.spec index c0273e4..b746d06 100644 --- a/paraview.spec +++ b/paraview.spec @@ -63,7 +63,7 @@
Name: paraview Version: %{pv_majmin}.%{pv_patch} -Release: 14%{?relsuf}%{?dist} +Release: 15%{?relsuf}%{?dist} Summary: Parallel visualization application
License: BSD @@ -715,6 +715,9 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
%changelog +* Wed Jan 29 2020 Fedora Release Engineering releng@fedoraproject.org - 5.6.0-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Wed Dec 18 2019 Orion Poplawski orion@cora.nwra.com - 5.6.0-14 - Rebuild for protobuf 3.11
commit 7ff472725d3264421cf132fd45ec983559cc7262 Author: Orion Poplawski orion@nwra.com Date: Wed Dec 18 12:07:27 2019 -0700
Rebuild for protobuf 3.11
diff --git a/paraview.spec b/paraview.spec index 7654a58..c0273e4 100644 --- a/paraview.spec +++ b/paraview.spec @@ -63,7 +63,7 @@
Name: paraview Version: %{pv_majmin}.%{pv_patch} -Release: 13%{?relsuf}%{?dist} +Release: 14%{?relsuf}%{?dist} Summary: Parallel visualization application
License: BSD @@ -715,6 +715,9 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
%changelog +* Wed Dec 18 2019 Orion Poplawski orion@cora.nwra.com - 5.6.0-14 +- Rebuild for protobuf 3.11 + * Fri Dec 13 2019 Orion Poplawski orion@nwra.com - 5.6.0-13 - Set QT_QPA_PLATFORM=xcb in desktop file to help with wayland issues (bz#1769060)
arch-excludes@lists.fedoraproject.org
-
githook-noreply＠fedoraproject.org