Accepting request 977481 from home:dimstar:Factory

- Fix a few rpmlint errors (to at least get below the 1000 mark)
  (boo#1199558):
  + make libpcp-devel require libpcp_gui: the devel package
    installs a symlink pointing to that library, so anything
    willing to link it would fail
    libpcp-devel.x86_64: E: no-library-dependency-on libpcp_gui2 /usr/lib64/libpcp_gui.so.2
    The package misses dependency on a package which file it links to.
  + Call fdupes over /var/lib/pcp/testsuite to solve
    pcp-testsuite.x86_64: W: files-duplicate
  + W: macro-in-comment: escape the relevant macros using %%
  + Filter out W: potential-bashisms for pcp-testsuite.

OBS-URL: https://build.opensuse.org/request/show/977481
OBS-URL: https://build.opensuse.org/package/show/Base:System/pcp?expand=0&rev=115

pcp-rpmlintrc

@@ -7,3 +7,9 @@ addFilter('E: devel-file-in-non-devel-package')
 # tmp files. it must be world writeable for PMDAs and client tools, which
 # may be run as anyone.
 #addFilter('E: permissions-world-writable')
+# pcp-testsuite.x86_64: W: potential-bashisms /var/lib/pcp/testsuite/archives/mk.ipcs
+# checkbashisms reported potential bashisms in a /bin/sh shell script, you might
+# want to manually check this script for bashisms.
+addFilter('pcp-testsuite.*W: potential-bashisms');
+# pcp-testsuite.x86_64: E: env-script-interpreter
+addFilter('pcp-testsuite.*E: env-script-interpreter');

pcp.changes

@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Mon May 16 07:30:26 UTC 2022 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Fix a few rpmlint errors (to at least get below the 1000 mark)
+  (boo#1199558):
+  + make libpcp-devel require libpcp_gui: the devel package
+    installs a symlink pointing to that library, so anything
+    willing to link it would fail
+    libpcp-devel.x86_64: E: no-library-dependency-on libpcp_gui2 /usr/lib64/libpcp_gui.so.2
+    The package misses dependency on a package which file it links to.
+  + Call fdupes over /var/lib/pcp/testsuite to solve
+    pcp-testsuite.x86_64: W: files-duplicate
+  + W: macro-in-comment: escape the relevant macros using %%
+  + Filter out W: potential-bashisms for pcp-testsuite.
+
 -------------------------------------------------------------------
 Mon Feb  7 16:25:45 UTC 2022 - Dominique Leuenberger <dimstar@opensuse.org>
 

pcp.spec

@@ -407,7 +407,7 @@ Obsoletes:      pcp-pmda-nvidia < %{version}
 %global _hicolordir	%{_datadir}/icons/hicolor
 
 %if 0%{?fedora} >= 20 || 0%{?rhel} >= 8 || 0%{?suse_version}
-# FIXME: PCP defaults to using %{_datadir}/doc/pcp-doc
+# FIXME: PCP defaults to using %%{_datadir}/doc/pcp-doc
 %global _with_doc --with-docdir=%{_docdir}/%{name}
 %endif
 %if !%{disable_systemd}
@@ -624,6 +624,7 @@ License:        %{license_gplv2plus} AND %{license_lgplv21plus}
 Group:          %{lib_devel_gr}
 URL:            https://pcp.io
 Requires:       %{lib_pkg} = %{version}-%{release}
+Requires:       libpcp_gui%{libpcp_gui_sover} = %{version}
 Conflicts:      %{lib_devel_pkg_conflict}
 %if (0%{?suse_version} > 0)
 Provides:       pcp-devel = %{version}
@@ -888,7 +889,7 @@ URL:            https://pcp.io
 %if !0%{?suse_version}
 Requires:       %{lib_pkg} >= %{version}-%{release}
 %else
-# this package nests files under %{_sysconfdir}/zabbix, which is provided by:
+# this package nests files under %%{_sysconfdir}/zabbix, which is provided by:
 Requires:       zabbix-server
 %endif
 
@@ -1869,7 +1870,7 @@ kernels configfs filesystem. The PMDA provides per LUN level stats, and a
 summary instance per iSCSI target, which aggregates all LUN metrics within the
 target.
 #end pcp-pmda-lio
-%endif # !%{disable_lio}
+%endif # !%%{disable_lio}
 
 #
 # pcp-pmda-openmetrics
@@ -1929,7 +1930,7 @@ This package contains the PCP Performance Metrics Domain Agent (PMDA) for
 collecting metrics from simple network checks.
 
 # end pcp-pmda-netcheck
-%endif # !%{disable_python3}
+%endif # !%%{disable_python3}
 
 %if !%{disable_mssql}
 #
@@ -1970,7 +1971,7 @@ BuildRequires:  python3-jsonpointer
 This package contains the PCP Performance Metrics Domain Agent (PMDA) for
 collecting metrics output in JSON.
 # end pcp-pmda-json
-%endif # !%{disable_json}
+%endif # !%%{disable_json}
 
 #
 # C pmdas
@@ -2603,6 +2604,8 @@ sed -i -e '/^# .*_LOCAL=1/s/^# //' %{buildroot}/%{_sysconfdir}/sysconfig/{pmcd,p
 %endif
 
 rm -f %{buildroot}/%{_localstatedir}/lib/pcp/testsuite/perfevent/perfevent_coverage # drop unreproducible file (boo#1040589)
+%fdupes %{buildroot}%{_testsdir}
+
 
 %if 0%{?suse_version}
 mkdir -p %{buildroot}/%{_tempsdir}
@@ -2613,7 +2616,7 @@ ln -sf /sbin/service %{buildroot}/%{_sbindir}/rcpmie
 ln -sf /sbin/service %{buildroot}/%{_sbindir}/rcpmlogger
 ln -sf /sbin/service %{buildroot}/%{_sbindir}/rcpmproxy
 
-# SUSE requires use of %fillup_and_insserv
+# SUSE requires use of %%fillup_and_insserv
 mkdir -p %{buildroot}/%{_fillupdir}
 for f in pmlogger pmproxy pmcd pmie_timers pmlogger_timers pmfind; do
 	mv %{buildroot}/%{_sysconfdir}/sysconfig/${f} \
@@ -3484,7 +3487,7 @@ PCP_LOG_DIR=%{_logsdir}
 %{_pmdasexecdir}/netcheck
 %{_confdir}/netcheck
 
-%endif # !%{disable_python3}
+%endif # !%%{disable_python3}
 
 %if !%{disable_zabbix_agent}
 %files export-zabbix-agent