From afe039d3b473998154fc261c151ae1b452e4cb31 Mon Sep 17 00:00:00 2001 From: zhangpan Date: Thu, 12 Jan 2023 02:32:19 +0000 Subject: [PATCH] splits subpackages --- cockpit.spec | 46 +++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 41 insertions(+), 5 deletions(-) diff --git a/cockpit.spec b/cockpit.spec index 7db3f6e..4124777 100644 --- a/cockpit.spec +++ b/cockpit.spec @@ -1,7 +1,7 @@ %bcond_with pcp Name: cockpit Version: 178 -Release: 9 +Release: 10 Summary: A easy-to-use, integrated, glanceable, and open web-based interface for Linux servers License: LGPLv2+ URL: https://cockpit-project.org/ @@ -21,10 +21,9 @@ BuildRequires: pcp-libs-devel %endif Requires: glib-networking shadow-utils grep libpwquality coreutils NetworkManager kexec-tools openssl glib2 >= 2.37.4 -Requires: python3 python3-dbus systemd udisks2 >= 2.6 libvirt libvirt-client PackageKit +Requires: python3 python3-dbus systemd udisks2 >= 2.6 PackageKit Provides: %{name}-networkmanager %{name}-selinux %{name}-sosreport %{name}-dashboard = %{version}-%{release} -Provides: %{name}-machines = %{version}-%{release} %{name}-machines-ovirt = %{version}-%{release} %{name}-shell %{name}-systemd Provides: %{name}-bridge = %{version}-%{release} %{name}-packagekit = %{version}-%{release} %{name}-storaged = %{version}-%{release} Provides: %{name}-system = %{version}-%{release} %{name}-ws = %{version}-%{release} %{name}-ssh %{name}-realmd Provides: %{name}-tuned %{name}-users %{name}-kdump @@ -32,7 +31,6 @@ Provides: bundled(js-jquery) = 3.3.1 bundled(js-moment) = 2.22.2 bundled(n Provides: bundled(nodejs-promise) = 8.0.2 bundled(nodejs-requirejs) = 2.1.22 bundled(xstatic-bootstrap-datepicker-common) = 1.8.0 Obsoletes: %{name}-networkmanager %{name}-selinux %{name}-sosreport %{name}-dashboard < %{version}-%{release} -Obsoletes: %{name}-machines < %{version}-%{release} %{name}-machines-ovirt < %{version}-%{release} %{name}-shell %{name}-systemd Obsoletes: %{name}-bridge < %{version}-%{release} %{name}-packagekit < %{version}-%{release} %{name}-storaged < %{version}-%{release} Obsoletes: %{name}-system < %{version}-%{release} %{name}-ws < %{version}-%{release} %{name}-ssh %{name}-realmd Obsoletes: %{name}-tuned %{name}-users %{name}-kdump @@ -68,6 +66,32 @@ Obsoletes: %{name}-tests < %{version}-%{release} This package contains some test files for testing the %{name}. It is not necessary for using %{name}. +%package cockpit-machines +BuildArch: noarch +Summary: Cockpit user interface for virtual machines +Requires: cockpit-bridge >=122 +Requires: cockpit-system >=122 +Requires: livirt +Requires: livirt-client +Requires: livirt-dbus +# Optional components +Recommends: virt-install + +%description cockpit-machines +The Cockpit components for managing virtual machines. +If "virt-install" is installed, you can also create new virtual machines. + +%package cockpit-machines-ovirt +BuildArch: noarch +Summary: Cockpit user interface for Ovirt virtual machines +Requires: cockpit-bridge >=122 +Requires: cockpit-system >=122 +Requires: livirt +Requires: livirt-client + +%description cockpit-machines-ovirt +The Cockpit components for managing Ovirt virtual machines. + %package help Summary: Help package for %{name} BuildArch: noarch @@ -148,7 +172,7 @@ test -f %{_bindir}/firewall-cmd && firewall-cmd --reload --quiet || true %{_datadir}/pixmaps/cockpit.png %{_datadir}/%{name}/motd/{update-motd,inactive.motd} %{_datadir}/%{name}/{static,branding} -%{_datadir}/%{name}/{base1,ssh,dashboard,realmd,tuned,shell,systemd,users,kdump,sosreport,storaged,networkmanager,packagekit,apps,machines,ovirt,selinux}/* +%{_datadir}/%{name}/{base1,ssh,dashboard,realmd,tuned,shell,systemd,users,kdump,sosreport,storaged,networkmanager,packagekit,apps,selinux}/* %{_unitdir}/{cockpit.service,cockpit-motd.service,cockpit.socket} %{_sysconfdir}/%{name}/machines.d %{_prefix}/lib/tmpfiles.d/cockpit-tempfiles.conf @@ -171,6 +195,12 @@ test -f %{_bindir}/firewall-cmd && firewall-cmd --reload --quiet || true %{_datadir}/cockpit/playground %{_prefix}/lib/cockpit-test-assets +%files cockpit-machinse +%{_datadir}/cockpit/mahcines + +%files cockpit-machinse-ovirt +%{_datadir}/cockpit/ovirt + %files help %{_docdir}/cockpit %exclude %{_docdir}/cockpit/{AUTHORS,COPYING,README.md} @@ -179,6 +209,12 @@ test -f %{_bindir}/firewall-cmd && firewall-cmd --reload --quiet || true %doc %{_mandir}/man8/{cockpit-ws.8.gz,remotectl.8.gz,pam_ssh_add.8.gz} %changelog +* Thu Jan 12 2023 zhangpan - 178-10 +- Type:NA +- Id:NA +- SUG:NA +- DESC:Splits subpackages cockpit-machines cockpit-machines-ovirt + * Fri Sep 24 2021 wangkerong - 178-9 - Type:CVE - Id:CVE-2021-3660