From dc3c881a2a521f09fb03e24c2cf0b43c94c5e8cc59a2830ad9faa11500732eab Mon Sep 17 00:00:00 2001 From: Ludwig Nussel Date: Tue, 9 Jun 2020 09:10:46 +0000 Subject: [PATCH] - disable selinux, sosreport and machines subpackages due to missing dependencies OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:cockpit/cockpit?expand=0&rev=33 --- cockpit.changes | 3 ++- cockpit.spec | 10 ++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/cockpit.changes b/cockpit.changes index 4d71a1a..2549127 100644 --- a/cockpit.changes +++ b/cockpit.changes @@ -1,7 +1,8 @@ ------------------------------------------------------------------- Tue Jun 9 08:46:59 UTC 2020 - Ludwig Nussel -- disable selinux and sosreport subpackages +- disable selinux, sosreport and machines subpackages due to missing + dependencies ------------------------------------------------------------------- Wed Apr 29 13:26:03 UTC 2020 - Ludwig Nussel diff --git a/cockpit.spec b/cockpit.spec index 190433a..6e533d6 100644 --- a/cockpit.spec +++ b/cockpit.spec @@ -315,6 +315,10 @@ find -L * -type l -printf "%H\n" | sort -u | xargs rm -rv popd # need this in SUSE as post build checks dislike stale symlinks install -m 644 -D /dev/null %{buildroot}/run/cockpit/motd +# remove files of not installable packages +rm -r %{buildroot}%{_datadir}/cockpit/{machines,sosreport,selinux} +rm -f %{buildroot}/%{_prefix}/share/metainfo/org.cockpit-project.cockpit-{machines,selinux,sosreport}.metainfo.xml +rm -f %{buildroot}%{_datadir}/pixmaps/cockpit-sosreport.png %else %global _debugsource_packages 1 %global _debuginfo_subpackages 0 @@ -644,7 +648,11 @@ The Cockpit component for managing storage. This package uses udisks. Summary: Tests for Cockpit Requires: cockpit-bridge >= 138 Requires: cockpit-system >= 138 +%if 0%{?suse_version} +Requires: openssh +%else Requires: openssh-clients +%endif Provides: cockpit-test-assets = %{version}-%{release} %description -n cockpit-tests @@ -655,6 +663,7 @@ These files are not required for running Cockpit. %config(noreplace) %{_sysconfdir}/cockpit/cockpit.conf %{_prefix}/%{__lib}/cockpit-test-assets +%if !0%{?suse_version} %package -n cockpit-machines BuildArch: noarch Summary: Cockpit user interface for virtual machines @@ -679,6 +688,7 @@ If "virt-install" is installed, you can also create new virtual machines. %files -n cockpit-machines -f machines.list %{_datadir}/metainfo/org.cockpit-project.cockpit-machines.metainfo.xml +%endif %package -n cockpit-pcp Summary: Cockpit PCP integration