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=4af45c473....
Change:
+%ifarch %{ix86}
Thanks.
Full change:
============
commit e8b6ee0348fcf1652fc9c541d12a7c3c668c947b
Author: Orion Poplawski <orion(a)nwra.com>
Date: Mon Mar 18 19:21:43 2024 -0600
Exclude libStereoCursorViews from requires (FTI bz#2268082)
diff --git a/paraview.spec b/paraview.spec
index a4c9a6a..8382dec 100644
--- a/paraview.spec
+++ b/paraview.spec
@@ -235,9 +235,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(catalyst|IceT|pq|QtTesting|vtk).*$
+%global __requires_exclude ^lib(catalyst|IceT|pq|QtTesting|StereoCursorViews|vtk).*$
%else
-%global __requires_exclude ^lib(catalyst|IceT|pq|QtTesting|vtk|protobuf).*$
+%global __requires_exclude
^lib(catalyst|IceT|pq|QtTesting|StereoCursorViews|vtk|protobuf).*$
%endif
ExcludeArch: %{ix86}
commit 4af45c473c4c829d020e1f93053686d5fa75c8e7
Author: Orion Poplawski <orion(a)nwra.com>
Date: Sat Mar 2 15:35:41 2024 -0700
Update to 5.12.0
Remove bundled nhlohmann-json and utf8 (bz#2251379)
diff --git a/.gitignore b/.gitignore
index 178444d..df1b640 100644
--- a/.gitignore
+++ b/.gitignore
@@ -47,3 +47,4 @@ ParaView-3.8.1.tar.gz
/ParaView-v5.11.0.tar.gz
/ParaView-v5.11.1.tar.gz
/ParaView-v5.11.2.tar.gz
+/ParaView-v5.12.0.tar.gz
diff --git a/paraview.spec b/paraview.spec
index c63bb16..a4c9a6a 100644
--- a/paraview.spec
+++ b/paraview.spec
@@ -6,10 +6,10 @@
%endif
%global pv_maj 5
-%global pv_min 11
-%global pv_patch 2
+%global pv_min 12
+%global pv_patch 0
%global pv_majmin %{pv_maj}.%{pv_min}
-#global rcsuf RC1
+#global rcsuf RC3
%{?rcsuf:%global relsuf .%{rcsuf}}
%{?rcsuf:%global versuf -%{rcsuf}}
@@ -19,8 +19,17 @@
%bcond_with openmpi
%else
%bcond_without mpich
+# No openmpi on i668 with openmpi 5 in Fedora 40+
+%if 0%{?fedora} >= 40
+%ifarch %{ix86}
+%bcond_with openmpi
+%else
+%bcond_without openmpi
+%endif
+%else
%bcond_without openmpi
%endif
+%endif
# cgnslib is too old on EL8
%if 0%{?el8}
@@ -61,6 +70,14 @@
%global system_pugixml 1
%global vtk_use_system_pugixml -DVTK_MODULE_USE_EXTERNAL_VTK_pugixml:BOOL=ON
+# Not packaged?
+%bcond_with token
+%if %{with token}
+%global vtk_use_system_token -DVTK_MODULE_USE_EXTERNAL_VTK_token:BOOL=ON
+%else
+%global vtk_use_system_token -DVTK_MODULE_USE_EXTERNAL_VTK_token:BOOL=OFF
+%endif
+
Name: paraview
Version: %{pv_maj}.%{pv_min}.%{pv_patch}
Release: %autorelease
@@ -103,6 +120,7 @@ BuildRequires: cli11-devel
BuildRequires: gdal-devel
BuildRequires: hdf5-devel
BuildRequires: tk-devel
+BuildRequires: fast_float-devel
BuildRequires: freetype-devel, libtiff-devel, zlib-devel
BuildRequires: expat-devel
BuildRequires: glew-devel
@@ -150,7 +168,6 @@ BuildRequires: glibc-langpack-en
Requires: hdf5%{?_hdf5_version: = %{_hdf5_version}}
Requires: %{name}-data = %{version}-%{release}
-#Recommends: python3-pygments
Requires: python3-pygments
Requires: python3-six
Requires: python3-netcdf4
@@ -247,7 +264,6 @@ ExcludeArch: %{ix86}
-DPARAVIEW_INSTALL_DEVELOPMENT_FILES:BOOL=ON \\\
-DVTK_PYTHON_VERSION=3 \\\
-DPARAVIEW_BUILD_WITH_EXTERNAL:BOOL=ON \\\
- -DVTK_MODULE_USE_EXTERNAL_ParaView_vtkcatalyst:BOOL=OFF \\\
%{?vtk_use_system_cgnslib} \\\
-DVTK_MODULE_USE_EXTERNAL_VTK_exprtk:BOOL=OFF \\\
%if !%{with fmt} \
@@ -259,6 +275,7 @@ ExcludeArch: %{ix86}
-DVTK_MODULE_USE_EXTERNAL_VTK_libharu=OFF \\\
%{?vtk_use_system_protobuf} \\\
%{?vtk_use_system_pugixml} \\\
+ %{?vtk_use_system_token} \\\
-DVTK_MODULE_USE_EXTERNAL_VTK_verdict:BOOL=OFF \\\
-DBUILD_EXAMPLES:BOOL=ON \\\
-DBUILD_TESTING:BOOL=OFF \\\
@@ -272,15 +289,12 @@ ExcludeArch: %{ix86}
-DCMAKE_INSTALL_LIBDIR:PATH=lib/%{name} \\\
-DHDF5_INCLUDE_DIRS:PATH=$MPI_INCLUDE \\\
-DPYTHON_INSTALL_DIR=PATH=$MPI_PYTHON3_SITEARCH \\\
- -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_MODULE_USE_EXTERNAL_ParaView_VisItLib:BOOL=OFF \\\
-DVISIT_BUILD_READER_CGNS=ON \\\
%endif \
%{paraview_cmake_options}
@@ -455,10 +469,12 @@ rm -r VTK/ThirdParty/pugixml/vtkpugixml
%endif
# TODO - loguru
# TODO - verdict - This is a kitware library so low priority
-for x in
vtk{cli11,doubleconversion,eigen,expat,%{?with_fmt:fmt,}freetype,%{?_with_gl2ps:gl2ps,}glew,hdf5,jpeg,libproj,libxml2,lz4,lzma,mpi4py,netcdf,ogg,pegtl,png,sqlite,theora,tiff,zfp,zlib}
+for x in
vtk{cli11,doubleconversion,eigen,expat,fast_float,%{?with_fmt:fmt,}freetype,%{?_with_gl2ps:gl2ps,}glew,hdf5,jpeg,libproj,libxml2,lz4,lzma,mpi4py,netcdf,nlohmannjson,ogg,pegtl,png,sqlite,theora,tiff,utf8,zfp,zlib}
do
rm -r VTK/ThirdParty/*/${x}
done
+# Remove version requirements
+sed -i -e '/VERSION *"/d' VTK/ThirdParty/fast_float/CMakeLists.txt
# jsoncpp
%if 0%{system_jsoncpp}
rm -r VTK/ThirdParty/jsoncpp/vtkjsoncpp
@@ -472,7 +488,8 @@ cp %SOURCE2 VTK/CMake/FindPEGTL.cmake
# $mpi will be evaluated in the loops below
%global _vpath_builddir %{_vendor}-%{_target_os}-build-${mpi:-serial}
-%build
+
+%conf
# Try to limit memory consumption on some arches
%ifarch %{arm}
%global optflags %(echo %{optflags} | sed 's/-g /-g1 /')
@@ -487,6 +504,16 @@ cp %SOURCE2 VTK/CMake/FindPEGTL.cmake
-DQtTesting_INSTALL_LIB_DIR=%{_lib}/%{name} \
-DQtTesting_INSTALL_CMAKE_DIR=%{_lib}/%{name}/CMake \
%{paraview_cmake_options}
+
+for mpi in %{mpi_list}
+do
+ module load mpi/$mpi-%{_arch}
+ %cmake -Wno-dev %{paraview_cmake_mpi_options}
+ module purge
+done
+
+
+%build
%cmake_build
export LANG=en_US.UTF-8
# Built-in Python modules were not found, set pythonpath as workaround
@@ -496,7 +523,6 @@ export
PYTHONPATH=$PWD/%{_lib}/paraview/python%{python3_version}/site-packages:%
for mpi in %{mpi_list}
do
module load mpi/$mpi-%{_arch}
- %cmake -Wno-dev %{paraview_cmake_mpi_options}
%cmake_build
module purge
done
@@ -570,7 +596,7 @@ fi
%exclude %{_libdir}/%{name}/*.a
%files data
-%license Copyright.txt License_v1.2.txt
+%license Copyright.txt
%dir %{_pkgdocdir}
%{_pkgdocdir}/README.md
%{_pkgdocdir}/README-VisItBridge.md
@@ -597,7 +623,7 @@ fi
%{_libdir}/openmpi/bin/[ps]*
%{_libdir}/openmpi/lib/%{name}/
%exclude %{_libdir}/openmpi/lib/%{name}/*.a
-%{_libdir}/openmpi/share/licenses/
+%license %{_libdir}/openmpi/share/licenses/
%files openmpi-devel
%{_includedir}/openmpi-%{_arch}/%{name}/
@@ -612,7 +638,7 @@ fi
%{_libdir}/mpich/bin/[ps]*
%{_libdir}/mpich/lib/%{name}/
%exclude %{_libdir}/mpich/lib/%{name}/*.a
-%{_libdir}/mpich/share/licenses/
+%license %{_libdir}/mpich/share/licenses/
%files mpich-devel
%{_includedir}/mpich-%{_arch}/%{name}/
diff --git a/sources b/sources
index 0940bde..abb4afa 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ParaView-v5.11.2.tar.gz) =
1600cd02d15e1d7b1244778f503014f2c02c3ad3e4c81b5ef6f7083fa74fc8a7c4e3c6702a70361ae4e0349bf18c782a4936c5386f59334293e0e53baf03ef77
+SHA512 (ParaView-v5.12.0.tar.gz) =
925f57e96bb3da1ec25be6a084900ea1bade534fcc1253dccc940a8121efd9f7b88b3076161e19819519bfc0f5461f74022670079dc3311d145d2569cc565d81