- Update to version 5.13.2:

* Update Insitu logic to use script filename (instead of full path) when searching PYTHONPATH directories (details). * Fixed CLI error loading multiple-file series (details). * Fixed CLI error that was opening two copies of single file specified in command line (details). * Fixed pvbatch syntax warning messages (“invalid escape sequence”) (details). * Fixed spreadsheet view to update correctly when timestep is reset to 0 (details). * Fixed problems loading state file when remote volume rendering is used (details). * More info at: <https://www.kitware.com/paraview-5-13-2-release-notes/>. - Use internal pegtl lib due to version incompatibility. - Disable ZFP due to building problems with internal/external. - Added sed command to fix linker flags in build.ninja. - Removed unnecessary shebang at rtImageTest.py. - Dropped patches: * 0001-Fix-missing-fmt-ranges.h-include-in-ioss-ThirdParty-.patch - Add patches: * 0001-Add-missing-libm-link-library-for-bundled-ExodusII.patch OBS-URL: https://build.opensuse.org/package/show/science/paraview?expand=0&rev=133
2025-01-07 17:09:51 +00:00 · 2025-01-07 17:09:51 +00:00 · 9c0981b5c0
commit 9c0981b5c0
parent 8ffb58de9e
9 changed files with 113 additions and 292 deletions
--- a/0001-Add-missing-libm-link-library-for-bundled-ExodusII.patch
+++ b/0001-Add-missing-libm-link-library-for-bundled-ExodusII.patch
@ -0,0 +1,22 @@
+From 11749efe6bbe30e8d9a88b624c356a45c3207fd2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
+Date: Thu, 12 Dec 2024 17:27:49 +0100
+Subject: [PATCH] Add missing libm link library for bundled ExodusII
+
+---
+ VTK/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/VTK/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt b/VTK/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt
+index e3b10bb9..8e4ccd6e 100644
+--- a/VTK/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt
+++ b/VTK/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt
+@@ -338,4 +338,5 @@ vtk_module_include(VTK::exodusII
+     "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>")
+ vtk_module_link(VTK::exodusII
+   PRIVATE
+    m
+     Threads::Threads)
+-- 
+2.47.1
+
--- a/0001-Fix-missing-fmt-ranges.h-include-in-ioss-ThirdParty-.patch
+++ b/0001-Fix-missing-fmt-ranges.h-include-in-ioss-ThirdParty-.patch
@ -1,89 +0,0 @@
-From f8e54b2da7854d894372e1e18e90cf1418138aeb Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
-Date: Sat, 4 Jan 2025 17:45:26 +0100
-Subject: [PATCH] Fix missing fmt/ranges.h include in ioss ThirdParty code
-
---
- VTK/ThirdParty/ioss/vtkioss/Ioss_Field.C            | 1 +
- VTK/ThirdParty/ioss/vtkioss/Ioss_IOFactory.C        | 1 +
- VTK/ThirdParty/ioss/vtkioss/Ioss_StructuredBlock.C  | 1 +
- VTK/ThirdParty/ioss/vtkioss/Ioss_Utils.C            | 1 +
- VTK/ThirdParty/ioss/vtkioss/Ioss_VariableType.C     | 1 +
- VTK/ThirdParty/ioss/vtkioss/Ioss_ZoneConnectivity.C | 1 +
- 6 files changed, 6 insertions(+)
-
-diff --git a/VTK/ThirdParty/ioss/vtkioss/Ioss_Field.C b/VTK/ThirdParty/ioss/vtkioss/Ioss_Field.C
-index 15a5a5bc..57459a2c 100644
--- a/VTK/ThirdParty/ioss/vtkioss/Ioss_Field.C
-+++ b/VTK/ThirdParty/ioss/vtkioss/Ioss_Field.C
-@@ -12,6 +12,7 @@
- #include <cstdint>
- #include "vtk_fmt.h"
- #include VTK_FMT(fmt/ostream.h)
-+#include VTK_FMT(fmt/ranges.h)
- #include <iostream>
- #include <string>
- #include <vector>
-diff --git a/VTK/ThirdParty/ioss/vtkioss/Ioss_IOFactory.C b/VTK/ThirdParty/ioss/vtkioss/Ioss_IOFactory.C
-index 440f352e..ca71a906 100644
--- a/VTK/ThirdParty/ioss/vtkioss/Ioss_IOFactory.C
-+++ b/VTK/ThirdParty/ioss/vtkioss/Ioss_IOFactory.C
-@@ -12,6 +12,7 @@
- #include <cstddef> // for nullptr
- #include "vtk_fmt.h"
- #include VTK_FMT(fmt/ostream.h)
-+#include VTK_FMT(fmt/ranges.h)
- #include <map>     // for _Rb_tree_iterator, etc
- #include <ostream> // for basic_ostream, etc
- #include <set>
-diff --git a/VTK/ThirdParty/ioss/vtkioss/Ioss_StructuredBlock.C b/VTK/ThirdParty/ioss/vtkioss/Ioss_StructuredBlock.C
-index 1609c31f..85b67e25 100644
--- a/VTK/ThirdParty/ioss/vtkioss/Ioss_StructuredBlock.C
-+++ b/VTK/ThirdParty/ioss/vtkioss/Ioss_StructuredBlock.C
-@@ -15,6 +15,7 @@
- #include <Ioss_StructuredBlock.h>
- #include "vtk_fmt.h"
- #include VTK_FMT(fmt/ostream.h)
-+#include VTK_FMT(fmt/ranges.h)
- 
- #include <cstddef> // for size_t
- #include <numeric>
-diff --git a/VTK/ThirdParty/ioss/vtkioss/Ioss_Utils.C b/VTK/ThirdParty/ioss/vtkioss/Ioss_Utils.C
-index 57021abd..cc5b8a48 100644
--- a/VTK/ThirdParty/ioss/vtkioss/Ioss_Utils.C
-+++ b/VTK/ThirdParty/ioss/vtkioss/Ioss_Utils.C
-@@ -21,6 +21,7 @@
- #include VTK_FMT(fmt/chrono.h)
- #include VTK_FMT(fmt/format.h)
- #include VTK_FMT(fmt/ostream.h)
-+#include VTK_FMT(fmt/ranges.h)
- #include <fstream>
- #include <sstream>
- #include <string>
-diff --git a/VTK/ThirdParty/ioss/vtkioss/Ioss_VariableType.C b/VTK/ThirdParty/ioss/vtkioss/Ioss_VariableType.C
-index 2792d80a..bba324e6 100644
--- a/VTK/ThirdParty/ioss/vtkioss/Ioss_VariableType.C
-+++ b/VTK/ThirdParty/ioss/vtkioss/Ioss_VariableType.C
-@@ -18,6 +18,7 @@
- #include <cstring>
- #include "vtk_fmt.h"
- #include VTK_FMT(fmt/ostream.h)
-+#include VTK_FMT(fmt/ranges.h)
- #include <map>
- #include <sstream>
- #include <string>
-diff --git a/VTK/ThirdParty/ioss/vtkioss/Ioss_ZoneConnectivity.C b/VTK/ThirdParty/ioss/vtkioss/Ioss_ZoneConnectivity.C
-index 5d324817..5cb3c024 100644
--- a/VTK/ThirdParty/ioss/vtkioss/Ioss_ZoneConnectivity.C
-+++ b/VTK/ThirdParty/ioss/vtkioss/Ioss_ZoneConnectivity.C
-@@ -9,6 +9,7 @@
- #include <cstddef> // for size_t
- #include "vtk_fmt.h"
- #include VTK_FMT(fmt/ostream.h)
-+#include VTK_FMT(fmt/ranges.h)
- #include <string> // for string
- #include <vector> // for vector
- 
-- 
-2.47.1
-
--- a/ParaView-v5.12.1.tar.xz
+++ b/ParaView-v5.12.1.tar.xz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:927f880c13deb6dde4172f4727d2b66f5576e15237b35778344f5dd1ddec863e
-size 129307060
--- a/ParaView-v5.13.2.tar.xz
+++ b/ParaView-v5.13.2.tar.xz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4e116250f8e1a9c480f97c5696c9cd72b4d4998b039ca46da8b224f27445f13e
+size 147014296
--- a/ParaViewGettingStarted-5.13.2.pdf
+++ b/ParaViewGettingStarted-5.13.2.pdf
--- a/fix-CVE-2024-50602.patch
+++ b/fix-CVE-2024-50602.patch
@ -1,145 +0,0 @@
-diff --git a/VTK/ThirdParty/expat/CMakeLists.txt b/VTK/ThirdParty/expat/CMakeLists.txt
-index eac9269138..7cb69efe25 100644
--- a/VTK/ThirdParty/expat/CMakeLists.txt
-+++ b/VTK/ThirdParty/expat/CMakeLists.txt
-@@ -8,9 +8,9 @@ vtk_module_third_party(
-       "Copyright (c) 1998-2000 Thai Open Source Software Center Ltd and Clark Cooper"
-       "Copyright (c) 2001-2019 Expat maintainers"
-     SPDX_DOWNLOAD_LOCATION
-      "git+https://gitlab.kitware.com/third-party/expat.git@for/vtk-20220921-2.4.8"
-+      "git+https://gitlab.kitware.com/third-party/expat.git@for/vtk-20241030-2.4.8"
-     VERSION
-      "2.4.1"
-+    "2.4.8" # CVE-2024-50602 fix manually added.
-     STANDARD_INCLUDE_DIRS
-   EXTERNAL
-     PACKAGE EXPAT
-diff --git a/VTK/ThirdParty/expat/Testing/CMakeLists.txt b/VTK/ThirdParty/expat/Testing/CMakeLists.txt
-new file mode 100644
-index 0000000000..35f9732a93
--- /dev/null
-+++ b/VTK/ThirdParty/expat/Testing/CMakeLists.txt
-@@ -0,0 +1 @@
-+add_subdirectory(Cxx)
-diff --git a/VTK/ThirdParty/expat/Testing/Cxx/CMakeLists.txt b/VTK/ThirdParty/expat/Testing/Cxx/CMakeLists.txt
-new file mode 100644
-index 0000000000..7f0b6aba12
--- /dev/null
-+++ b/VTK/ThirdParty/expat/Testing/Cxx/CMakeLists.txt
-@@ -0,0 +1,4 @@
-+vtk_add_test_cxx(vtkexpatCxxTests tests
-+  NO_DATA NO_VALID NO_OUTPUT
-+  TestIncludeExpat.cxx)
-+vtk_test_cxx_executable(vtkexpatCxxTests tests)
-diff --git a/VTK/ThirdParty/expat/Testing/Cxx/TestIncludeExpat.cxx b/VTK/ThirdParty/expat/Testing/Cxx/TestIncludeExpat.cxx
-new file mode 100644
-index 0000000000..33ac2b65d2
--- /dev/null
-+++ b/VTK/ThirdParty/expat/Testing/Cxx/TestIncludeExpat.cxx
-@@ -0,0 +1,8 @@
-+#include "vtk_expat.h"
-+
-+#include <cstdlib>
-+
-+int TestIncludeExpat(int /*argc*/, char* /*argv*/[])
-+{
-+  return EXIT_SUCCESS;
-+}
-diff --git a/VTK/ThirdParty/expat/update.sh b/VTK/ThirdParty/expat/update.sh
-index 1b4740f2cc..3781700497 100755
--- a/VTK/ThirdParty/expat/update.sh
-+++ b/VTK/ThirdParty/expat/update.sh
-@@ -8,7 +8,7 @@ readonly name="expat"
- readonly ownership="Expat Upstream <kwrobot@kitware.com>"
- readonly subtree="ThirdParty/$name/vtk$name"
- readonly repo="https://gitlab.kitware.com/third-party/expat.git"
-readonly tag="for/vtk-20231023-2.4.8"
-+readonly tag="for/vtk-20241030-2.4.8"
- readonly paths="
- expat/.gitattributes
- expat/CMakeLists.txt
-diff --git a/VTK/ThirdParty/expat/vtk.module b/VTK/ThirdParty/expat/vtk.module
-index bbc9a339b8..95ec414d25 100644
--- a/VTK/ThirdParty/expat/vtk.module
-+++ b/VTK/ThirdParty/expat/vtk.module
-@@ -2,4 +2,6 @@ NAME
-   VTK::expat
- LIBRARY_NAME
-   vtkexpat
-+TEST_DEPENDS
-+  VTK::TestingCore
- THIRD_PARTY
-diff --git a/VTK/ThirdParty/expat/vtkexpat/CMakeLists.txt b/VTK/ThirdParty/expat/vtkexpat/CMakeLists.txt
-index 1910141339..a213b32ec7 100644
--- a/VTK/ThirdParty/expat/vtkexpat/CMakeLists.txt
-+++ b/VTK/ThirdParty/expat/vtkexpat/CMakeLists.txt
-@@ -459,9 +459,10 @@ set(expat_headers
-   lib/vtk_expat_mangle.h)
- 
- vtk_module_add_module(VTK::expat
-+  HEADER_DIRECTORIES
-   SOURCES ${_EXPAT_C_SOURCES}
-   HEADERS ${expat_headers}
-  HEADERS_SUBDIR "vtkexpat/lib")
-+  HEADERS_SUBDIR "vtkexpat")
- endif ()
- 
- if (FALSE) # XXX(kitware): VTK handles installation
-diff --git a/VTK/ThirdParty/expat/vtkexpat/lib/expat.h b/VTK/ThirdParty/expat/vtkexpat/lib/expat.h
-index c076f3d535..1475d1e783 100644
--- a/VTK/ThirdParty/expat/vtkexpat/lib/expat.h
-+++ b/VTK/ThirdParty/expat/vtkexpat/lib/expat.h
-@@ -129,7 +129,9 @@ enum XML_Error {
-   /* Added in 2.3.0. */
-   XML_ERROR_NO_BUFFER,
-   /* Added in 2.4.0. */
-  XML_ERROR_AMPLIFICATION_LIMIT_BREACH
-+  XML_ERROR_AMPLIFICATION_LIMIT_BREACH,
-+  /* Added in 2.6.4. */
-+  XML_ERROR_NOT_STARTED,
- };
- 
- enum XML_Content_Type {
-diff --git a/VTK/ThirdParty/expat/vtkexpat/lib/xmlparse.c b/VTK/ThirdParty/expat/vtkexpat/lib/xmlparse.c
-index e986156ecb..a770978e13 100644
--- a/VTK/ThirdParty/expat/vtkexpat/lib/xmlparse.c
-+++ b/VTK/ThirdParty/expat/vtkexpat/lib/xmlparse.c
-@@ -2162,6 +2162,9 @@ XML_StopParser(XML_Parser parser, XML_Bool resumable) {
-   if (parser == NULL)
-     return XML_STATUS_ERROR;
-   switch (parser->m_parsingStatus.parsing) {
-+  case XML_INITIALIZED:
-+    parser->m_errorCode = XML_ERROR_NOT_STARTED;
-+    return XML_STATUS_ERROR;
-   case XML_SUSPENDED:
-     if (resumable) {
-       parser->m_errorCode = XML_ERROR_SUSPENDED;
-@@ -2172,7 +2175,7 @@ XML_StopParser(XML_Parser parser, XML_Bool resumable) {
-   case XML_FINISHED:
-     parser->m_errorCode = XML_ERROR_FINISHED;
-     return XML_STATUS_ERROR;
-  default:
-+  case XML_PARSING:
-     if (resumable) {
- #ifdef XML_DTD
-       if (parser->m_isParamEntity) {
-@@ -2183,6 +2186,9 @@ XML_StopParser(XML_Parser parser, XML_Bool resumable) {
-       parser->m_parsingStatus.parsing = XML_SUSPENDED;
-     } else
-       parser->m_parsingStatus.parsing = XML_FINISHED;
-+    break;
-+  default:
-+    assert(0);
-   }
-   return XML_STATUS_OK;
- }
-@@ -2447,6 +2453,9 @@ XML_ErrorString(enum XML_Error code) {
-   case XML_ERROR_AMPLIFICATION_LIMIT_BREACH:
-     return XML_L(
-         "limit on input amplification factor (from DTD and entities) breached");
-+  /* Added in 2.6.4. */
-+  case XML_ERROR_NOT_STARTED:
-+    return XML_L("parser not started");
-   }
-   return NULL;
- }
--- a/2
+++ b/2
@ -10,4 +10,4 @@ addFilter("devel-file-in-non-devel-package .*/usr/lib.*/paraview-[0-9.]*/plugins
 addFilter("python3-paraview.* explicit-lib-dependency python3-matplotlib")

 # 0 size files are referenced in cmake files
-addFilter("paraview-devel.* zero-length")
+addFilter("paraview.* zero-length")
--- a/paraview.changes
+++ b/paraview.changes
@ -1,3 +1,29 @@
+-------------------------------------------------------------------
+Thu Jan 06 00:01:00 UTC 2025 - Vicente Adolfo Bolea Sanchez <vicente.bolea@gmail.com>
+
+- Update to version 5.13.2:
+  * Update Insitu logic to use script filename (instead of full
+    path) when searching PYTHONPATH directories (details).
+  * Fixed CLI error loading multiple-file series (details).
+  * Fixed CLI error that was opening two copies of single file
+    specified in command line (details).
+  * Fixed pvbatch syntax warning messages (“invalid escape
+    sequence”) (details).
+  * Fixed spreadsheet view to update correctly when timestep is
+    reset to 0 (details).
+  * Fixed problems loading state file when remote volume rendering
+    is used (details).
+  * More info at:
+    <https://www.kitware.com/paraview-5-13-2-release-notes/>.
+- Use internal pegtl lib due to version incompatibility.
+- Disable ZFP due to building problems with internal/external.
+- Added sed command to fix linker flags in build.ninja.
+- Removed unnecessary shebang at rtImageTest.py.
+- Dropped patches:
+  * 0001-Fix-missing-fmt-ranges.h-include-in-ioss-ThirdParty-.patch
+- Add patches:
+  * 0001-Add-missing-libm-link-library-for-bundled-ExodusII.patch
+
 -------------------------------------------------------------------
 Sat Jan  4 05:54:25 UTC 2025 - Stefan Brüns <stefan.bruens@rwth-aachen.de>

--- a/paraview.spec
+++ b/paraview.spec
@ -17,7 +17,7 @@


 %define major_ver 5
-%define minor_ver 12
+%define minor_ver 13
 %define short_ver %{major_ver}.%{minor_ver}
 %define shlib libparaview%{major_ver}_%{minor_ver}

@ -33,6 +33,7 @@
 %endif

 %if 0%{?sle_version} <= 150600
+%bcond_with    jsoncpp
 %bcond_with    fmt
 %bcond_with    haru
 %else
@ -53,9 +54,8 @@
 %bcond_without proj
 %bcond_without gl2ps

-%define __builder ninja
 Name:           paraview
-Version:        %{short_ver}.1
+Version:        %{short_ver}.2
 Release:        0
 Summary:        Data analysis and visualization application
 License:        BSD-3-Clause
@ -64,17 +64,15 @@ URL:            https://www.paraview.org
 Source0:        https://www.paraview.org/files/v%{short_ver}/ParaView-v%{version}.tar.xz
 Source1:        %{name}-rpmlintrc
 # CAUTION: GettingStarted may or may not be updated with each minor version
-Source2:        https://www.paraview.org/files/v%{short_ver}/ParaViewGettingStarted-%{major_ver}.%{minor_ver}.0.pdf
+Source2:        https://www.paraview.org/files/v%{short_ver}/ParaViewGettingStarted-%{major_ver}.%{minor_ver}.2.pdf
 # PATCH-FIX-UPSTREAM paraview-desktop-entry-fix.patch badshah400@gmail.com -- Fix desktop menu entry by inserting proper required categories
 Patch0:         paraview-desktop-entry-fix.patch
-# PATCH-FIX-UPSTREAM  https://gitlab.kitware.com/vtk/vtk/-/merge_requests/11609 --- Fixes CVE-2024-50602
-Patch1:         fix-CVE-2024-50602.patch
 # PATCH-FIX-OPENSUSE fix-libharu-missing-m.patch -- missing libraries for linking (gh#libharu/libharu#213)
-Patch2:         fix-libharu-missing-m.patch
+Patch1:         fix-libharu-missing-m.patch
 # We need to change the default soname for vtk modules.
-Patch3:         fix-soversion-soname.patch
-# PATCH-FIX-OPENSUSE
-Patch4:         0001-Fix-missing-fmt-ranges.h-include-in-ioss-ThirdParty-.patch
+Patch2:         fix-soversion-soname.patch
+# PATCH-FIX-UPSTREAM
+Patch3:         0001-Add-missing-libm-link-library-for-bundled-ExodusII.patch
 BuildRequires:  Mesa-devel
 BuildRequires:  cgns-devel
 BuildRequires:  cmake >= 3.13
@ -82,9 +80,6 @@ BuildRequires:  desktop-file-utils
 BuildRequires:  double-conversion-devel
 BuildRequires:  doxygen
 BuildRequires:  fdupes
-%if %{with fmt}
-BuildRequires:  fmt-devel > 9.0
-%endif
 BuildRequires:  gcc-c++
 BuildRequires:  gcc-fortran
 BuildRequires:  gnuplot
@ -92,13 +87,9 @@ BuildRequires:  graphviz
 BuildRequires:  hdf5-devel
 BuildRequires:  libboost_graph-devel
 BuildRequires:  libboost_headers-devel
-%if %{with gl2ps}
-BuildRequires:  gl2ps-devel >= 1.4.1
-%endif
-%if %{with haru}
-BuildRequires:  libharu-devel > 2.4.0
-%endif
 BuildRequires:  ninja
+BuildRequires:  pkgconfig
+BuildRequires:  protobuf21-devel
 BuildRequires:  python3-Sphinx
 BuildRequires:  python3-Twisted
 BuildRequires:  python3-devel
@ -106,9 +97,8 @@ BuildRequires:  python3-matplotlib
 BuildRequires:  python3-qt5-devel
 BuildRequires:  readline-devel
 BuildRequires:  utfcpp-devel
-%if %{with fast_float}
-BuildRequires:  cmake(FastFloat)
-%endif
+BuildRequires:  wget
+BuildRequires:  pkgconfig(CLI11)
 BuildRequires:  pkgconfig(Qt5Core)
 BuildRequires:  pkgconfig(Qt5Gui)
 BuildRequires:  pkgconfig(Qt5Help)
@ -122,9 +112,6 @@ BuildRequires:  pkgconfig(eigen3) >= 2.91.0
 BuildRequires:  pkgconfig(expat)
 BuildRequires:  pkgconfig(freetype2)
 BuildRequires:  pkgconfig(glew)
-%if %{with jsoncpp}
-BuildRequires:  pkgconfig(jsoncpp) >= 1.9.4
-%endif
 BuildRequires:  pkgconfig(libjpeg)
 BuildRequires:  pkgconfig(liblz4) >= 1.7.3
 BuildRequires:  pkgconfig(liblzma)
@ -135,8 +122,25 @@ BuildRequires:  pkgconfig(netcdf)
 BuildRequires:  pkgconfig(ogg)
 BuildRequires:  pkgconfig(openssl)
 BuildRequires:  pkgconfig(proj) >= 5.0.0
-BuildRequires:  pkgconfig(protobuf)
 BuildRequires:  pkgconfig(sqlite3)
+BuildRequires:  pkgconfig(theora)
+BuildRequires:  pkgconfig(xt)
+BuildRequires:  pkgconfig(zlib)
+%if %{with fmt}
+BuildRequires:  fmt-10-devel
+%endif
+%if %{with gl2ps}
+BuildRequires:  gl2ps-devel >= 1.4.1
+%endif
+%if %{with haru}
+BuildRequires:  libharu-devel > 2.4.0
+%endif
+%if %{with fast_float}
+BuildRequires:  cmake(FastFloat)
+%endif
+%if %{with jsoncpp}
+BuildRequires:  pkgconfig(jsoncpp) >= 1.9.4
+%endif
 %if %{with nlohmann}
 BuildRequires:  pkgconfig(nlohmann_json)
 %endif
@ -146,13 +150,9 @@ BuildRequires:  pkgconfig(pugixml) >= 1.11
 %if %{with verdict}
 BuildRequires:  verdict-devel
 %endif
-BuildRequires:  pkgconfig(CLI11)
-BuildRequires:  pkgconfig(theora)
-BuildRequires:  pkgconfig(xt)
-BuildRequires:  pkgconfig(zlib)
-Recommends:     %{name}-plugins
 Requires:       gnuplot
 Requires:       graphviz
+Recommends:     %{name}-plugins
 # Disable on aarch64 since GLES isn't supported for bundled vtk but is needed for paraview
 ExcludeArch:    aarch64

@ -178,7 +178,7 @@ This package provides the shared libraries for paraview.
 Summary:        Headers for building ParaView plugins or embedding Catalyst
 Group:          Development/Libraries/Other
 Requires:       %{shlib} = %{version}
-Requires:       cmake >= 3.3
+Requires:       cmake >= 3.13
 Requires:       glibc-devel
 Requires:       libboost_thread-devel

@ -219,7 +219,7 @@ This package provides the paraview plugins bundled with the upstream release.
 %autosetup -p1 -n ParaView-v%{version}

 # FIX env BASED HASHBANG
-sed -Ei "1{s|#!/usr/bin/env python3|#!/usr/bin/python3|}" Clients/CommandLineExecutables/paraview-config.in
+sed -Ei "1{s|#!%{_bindir}/env python3|#!%{_bindir}/python3|}" Clients/CommandLineExecutables/paraview-config.in

 # Fix erroneous dependency on sqlite3 binary
 sed -i -e '/set(vtk_sqlite_build_binary 1)/ s/.*/#\0/' CMakeLists.txt
@ -228,34 +228,35 @@ sed -i -e '/set(vtk_sqlite_build_binary 1)/ s/.*/#\0/' CMakeLists.txt
 sed -i -e '/VERSION .*/ d' VTK/ThirdParty/fast_float/CMakeLists.txt

 %build
-%global _lto_cflags %{_lto_cflags} -ffat-lto-objects
+%global _lto_cflags %{?_lto_cflags} -ffat-lto-objects
+%global __builder ninja

 %cmake -DCMAKE_INSTALL_LIBDIR=%{_lib} \
       -DCMAKE_INSTALL_DOCDIR=%{_docdir}/%{name} \
       -DPARAVIEW_BUILD_SHARED_LIBS:BOOL=ON \
-%if 0%{?suse_version} <= 1500
+%if 0%{?suse_version} <= 1500 && 0%{?is_opensuse}
       -DCMAKE_SKIP_RPATH:BOOL=OFF \
 %endif
-       -DCMAKE_SKIP_INSTALL_RPATH:BOOL=ON \
-       -DVTK_IGNORE_CMAKE_CXX11_CHECKS:BOOL=ON \
-       -DCMAKE_CXX_EXTENSIONS:BOOL=OFF \
-       -DCMAKE_CXX_STANDARD=17 \
-       -DCMAKE_CXX_STANDARD_REQUIRED:BOOL=ON \
-       -DPARAVIEW_USE_VTKM:BOOL=OFF \
-       -DPARAVIEW_USE_QT:BOOL=ON \
-       -DPARAVIEW_USE_PYTHON:BOOL=ON \
-       -DPARAVIEW_PYTHON_SITE_PACKAGES_SUFFIX=%{_lib}/python%{py3_ver}/site-packages/paraview \
-       -DVTK_PYTHON_OPTIONAL_LINK:BOOL=OFF \
-       -DPARAVIEW_ENABLE_WEB:BOOL=ON \
-       -DVTK_WRAP_PYTHON:BOOL=ON \
-       -DVTK_OPENGL_HAS_OSMESA:BOOL=OFF \
       -DBUILD_EXAMPLES:BOOL=OFF \
       -DBUILD_TESTING:BOOL=OFF \
+       -DCMAKE_CXX_EXTENSIONS:BOOL=OFF \
+       -DCMAKE_SKIP_INSTALL_RPATH:BOOL=ON \
+       -DPARAVIEW_BUILD_WITH_EXTERNAL:BOOL=ON \
+       -DPARAVIEW_ENABLE_WEB:BOOL=ON \
+       -DPARAVIEW_INSTALL_DEVELOPMENT_FILES:BOOL=ON \
+       -DPARAVIEW_PYTHON_SITE_PACKAGES_SUFFIX=%{_lib}/python%{py3_ver}/site-packages/paraview \
+       -DPARAVIEW_USE_PYTHON:BOOL=ON \
+       -DPARAVIEW_USE_QT:BOOL=ON \
+       -DPARAVIEW_USE_VTKM:BOOL=OFF \
       -DQtTesting_INSTALL_NO_DEVELOPMENT:BOOL=ON \
       -DVTK_BUILD_QT_DESIGNER_PLUGIN:BOOL=OFF \
-       -DPARAVIEW_INSTALL_DEVELOPMENT_FILES:BOOL=ON \
-       -DPARAVIEW_BUILD_WITH_EXTERNAL:BOOL=ON \
-       -DVTK_MODULE_USE_EXTERNAL_ParaView_vtkcatalyst:BOOL=OFF \
+       -DVTK_ENABLE_CATALYST:BOOL=ON \
+       -DVTK_OPENGL_HAS_OSMESA:BOOL=OFF \
+       -DVTK_PYTHON_OPTIONAL_LINK:BOOL=OFF \
+       -DVTK_WRAP_PYTHON:BOOL=ON \
+       -DVTK_MODULE_ENABLE_VTK_libharu:BOOL=YES \
+       -DVTK_MODULE_ENABLE_VTK_pegtl:BOOL=YES \
+       -DVTK_MODULE_ENABLE_VTK_zfp:BOOL=NO \
       -DVTK_MODULE_USE_EXTERNAL_VTK_exprtk:BOOL=OFF \
       -DVTK_MODULE_USE_EXTERNAL_VTK_fast_float:BOOL=%{?with_fast_float:ON}%{!?with_fast_float:OFF} \
       -DVTK_MODULE_USE_EXTERNAL_VTK_fmt:BOOL=%{?with_fmt:ON}%{!?with_fmt:OFF} \
@ -265,12 +266,18 @@ sed -i -e '/VERSION .*/ d' VTK/ThirdParty/fast_float/CMakeLists.txt
       -DVTK_MODULE_USE_EXTERNAL_VTK_libharu=%{?with_haru:ON}%{!?with_haru:OFF} \
       -DVTK_MODULE_USE_EXTERNAL_VTK_libproj=%{?with_proj:ON}%{!?with_proj:OFF} \
       -DVTK_MODULE_USE_EXTERNAL_VTK_nlohmannjson=%{?with_nlohmann:ON}%{!?with_nlohmann:OFF} \
+       -DVTK_MODULE_USE_EXTERNAL_VTK_pegtl=NO \
       -DVTK_MODULE_USE_EXTERNAL_VTK_pugixml=%{?with_pugixml:ON}%{!?with_pugixml:OFF} \
       -DVTK_MODULE_USE_EXTERNAL_VTK_token:BOOL=OFF \
       -DVTK_MODULE_USE_EXTERNAL_VTK_verdict=%{?with_verdict:ON}%{!?with_verdict:OFF} \
       -Wno-dev \
       %{nil}

+# ParaView >= 5.13.2 wrongly adds each option of CMAKE_SHARED_LINKER_FLAGS as a single
+# option with multiple -Wl in betwen, this makes the build fail. Correct it manually
+sed -i 's/,-Wl/ -Wl/g' ./build.ninja
+sed -i 's/,-ffat-lto-objects/ -ffat-lto-objects/g' ./build.ninja
+
 %cmake_build

 %install
@ -279,15 +286,15 @@ find . \( -name \*.txt -o -name \*.xml -o -name '*.[ch]' -o -name '*.[ch][px][px
 %cmake_install

 # Unnecessary hash-bang
-sed -i "1{\@/usr/bin/env@d}" %{buildroot}%{python3_sitearch}/paraview/vtkmodules/generate_pyi.py
+sed -i "1{\@%{_bindir}/env@d}" %{buildroot}%{python3_sitearch}/paraview/vtkmodules/generate_pyi.py
+sed -i "1{\@%{_bindir}/env@d}" %{buildroot}%{python3_sitearch}/paraview/vtkmodules/test/rtImageTest.py

 # INSTALL DOCUMENTATION USED BY THE HELP MENU IN MAIN APP
-install -Dm0644 %{S:2} %{buildroot}%{_datadir}/%{name}-%{short_ver}/doc/GettingStarted.pdf
+install -Dm0644 %{SOURCE2} %{buildroot}%{_datadir}/%{name}-%{short_ver}/doc/GettingStarted.pdf

 %fdupes %{buildroot}/

 %post -n %{shlib} -p /sbin/ldconfig
-
 %postun -n %{shlib} -p /sbin/ldconfig

 %files