diff --git a/paraview.changes b/paraview.changes index 08c3cd8..29a1187 100644 --- a/paraview.changes +++ b/paraview.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Tue May 5 17:56:54 UTC 2020 - Atri Bhattacharya + +- Disable the Paraview Protobuf module for openSUSE:Leap <= 15.1, + as the FindProtobuf module bundled with cmake < 3.13 is + incompatible with the requirements here. +- Package static libraries as part of devel-static package; this + is needed, for example, to build plugins against paraview. See + https://gitlab.kitware.com/paraview/paraview/-/issues/19706#note_746038. + ------------------------------------------------------------------- Wed Apr 8 18:26:31 UTC 2020 - Christoph G diff --git a/paraview.spec b/paraview.spec index 35c7227..db11c15 100644 --- a/paraview.spec +++ b/paraview.spec @@ -29,6 +29,12 @@ # Need patched version with HPDF_SHADING %bcond_with haru +%if 0%{?suse_version} == 1500 && 0%{?sle_version} <= 150100 +%bcond_with protobuf +%else +%bcond_without protobuf +%endif + %define __builder ninja Name: paraview @@ -112,7 +118,9 @@ BuildRequires: pkgconfig(libtiff-4) BuildRequires: pkgconfig(netcdf) BuildRequires: pkgconfig(ogg) BuildRequires: pkgconfig(openssl) +%if %{with protobuf} BuildRequires: pkgconfig(protobuf) >= 2.6.0 +%endif %if %{with pugixml} BuildRequires: pkgconfig(pugixml) %endif @@ -165,6 +173,15 @@ Requires: python3-matplotlib Requires: python3-numpy Requires: python3-qt5 +%package devel-static +Summary: Static libraries for Paraview, needed to building plugins +Group: Productivity/Scientific/Physics +Requires: %{name}-devel = %{version} + +%description devel-static +This package contains the static libraries for Paraview, needed, for +example, to build plugins for paraview. + %description -n python3-paraview This package provides the python(3) bindings and modules for paraview. @@ -204,7 +221,9 @@ sed -Ei "1{s|#!/usr/bin/env python3|#!/usr/bin/python3|}" Clients/CommandLineExe -DPARAVIEW_BUILD_WITH_EXTERNAL:BOOL=ON \ -DVTK_MODULE_USE_EXTERNAL_VTK_gl2ps=%{?with_gl2ps:ON}%{!?with_gl2ps:OFF} \ -DVTK_MODULE_USE_EXTERNAL_VTK_libharu=%{?with_haru:ON}%{!?with_haru:OFF} \ - -DVTK_MODULE_USE_EXTERNAL_VTK_pugixml=%{?with_pugixml:ON}%{!?with_pugixml:OFF} + -DVTK_MODULE_USE_EXTERNAL_VTK_pugixml=%{?with_pugixml:ON}%{!?with_pugixml:OFF} \ + -DVTK_MODULE_ENABLE_ParaView_protobuf=%{?with_protobuf:YES}%{!?with_protobuf:NO} \ + -DVTK_MODULE_ENABLE_ParaView_RemotingServerManager=%{?with_protobuf:YES}%{!?with_protobuf:NO} %cmake_build @@ -214,7 +233,6 @@ find . \( -name \*.txt -o -name \*.xml -o -name '*.[ch]' -o -name '*.[ch][px][px %cmake_install # UNNECESSARY STATIC LIBS -rm -fr %{buildroot}%{_libdir}/*.a rm %{buildroot}%{_libdir}/%{name}-%{major_ver}/plugins/GeodesicMeasurement/libFmmMesh.a # INSTALL DOCUMENTATION USED BY THE HELP MENU IN MAIN APP @@ -258,6 +276,9 @@ rm %{buildroot}%{_bindir}/paraview-config %{_bindir}/vtk* %{_includedir}/%{name}* +%files devel-static +%{_libdir}/*.a + %files -n python3-paraview %{python3_sitearch}/%{name}/