diff --git a/paraview-rpmlintrc b/paraview-rpmlintrc index 58bc953..7b29d6c 100644 --- a/paraview-rpmlintrc +++ b/paraview-rpmlintrc @@ -8,3 +8,6 @@ addFilter("devel-file-in-non-devel-package .*/usr/lib.*/paraview-[0-9.]*/plugins # python3-matplotlib is not a lib addFilter("python3-paraview.* explicit-lib-dependency python3-matplotlib") + +# 0 size files are referenced in cmake files +addFilter("paraview-devel.* zero-length") diff --git a/paraview.changes b/paraview.changes index 6bd047f..c798229 100644 --- a/paraview.changes +++ b/paraview.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Jan 19 13:38:42 UTC 2024 - Atri Bhattacharya + +- Do not delete zero-sized .cmake files, these are referenced from + other cmake files; use rpmlintrc rule to suppress warnings. +- Do not delete paraview-config script now that we have a + -devel-static package; instead include it as part of the latter. + ------------------------------------------------------------------- Sat Sep 30 17:16:04 UTC 2023 - Atri Bhattacharya diff --git a/paraview.spec b/paraview.spec index 32c2787..436d57c 100644 --- a/paraview.spec +++ b/paraview.spec @@ -1,7 +1,7 @@ # # spec file for package paraview # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -262,12 +262,6 @@ sed -i "1{\@/usr/bin/env@d}" %{buildroot}%{python3_sitearch}/paraview/vtkmodules install -Dm0644 %{S:2} %{buildroot}%{_datadir}/%{name}-%{short_ver}/doc/GettingStarted.pdf install -Dm0644 %{S:3} %{buildroot}%{_datadir}/%{name}-%{short_ver}/doc/Guide.pdf -# REMOVE paraview-config: DOESN'T WORK WITHOUT STATIC LIBS ANYWAY -rm %{buildroot}%{_bindir}/paraview-config - -# Delete zero-length cmake files -find %{buildroot}%{_libdir}/cmake/paraview-%{short_ver}/ -size 0 -delete -print - %fdupes %{buildroot}/ %post -n %{shlib} -p /sbin/ldconfig @@ -277,6 +271,9 @@ find %{buildroot}%{_libdir}/cmake/paraview-%{short_ver}/ -size 0 -delete -print %files %license %{_datadir}/licenses/ParaView/ %{_bindir}/* +# Part of paraview-devel-static +%exclude %{_bindir}/paraview-config +# %exclude %{_bindir}/smTest* %exclude %{_bindir}/vtk* %{_datadir}/%{name}-%{short_ver}/ @@ -306,6 +303,7 @@ find %{buildroot}%{_libdir}/cmake/paraview-%{short_ver}/ -size 0 -delete -print %{_includedir}/%{name}* %files devel-static +%{_bindir}/paraview-config %{_libdir}/*.a %files -n python3-paraview