From d2064788873ed022e23bb1512e48668ec2d4c490 Mon Sep 17 00:00:00 2001 From: zhangpan Date: Tue, 10 Jan 2023 10:05:11 +0000 Subject: [PATCH 1/5] splits subpackages (cherry picked from commit 591d3905333afb6ea49d8246d60a7a7113db5cae) --- cockpit.spec | 49 +++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 45 insertions(+), 4 deletions(-) diff --git a/cockpit.spec b/cockpit.spec index 8fb7caf..09bfeec 100644 --- a/cockpit.spec +++ b/cockpit.spec @@ -1,7 +1,7 @@ %bcond_with pcp Name: cockpit Version: 178 -Release: 12 +Release: 13 Summary: A easy-to-use, integrated, glanceable, and open web-based interface for Linux servers License: LGPLv2+ URL: https://cockpit-project.org/ @@ -22,10 +22,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 @@ -33,7 +32,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 @@ -180,7 +178,50 @@ test -f %{_bindir}/firewall-cmd && firewall-cmd --reload --quiet || true %doc %{_mandir}/man5/cockpit.conf.5.gz %doc %{_mandir}/man8/{cockpit-ws.8.gz,remotectl.8.gz,pam_ssh_add.8.gz} +%package -n cockpit-machines +BuildArch: noarch +Summary: Cockpit user interface for virtual machines +Requires: cockpit-bridge >= 122 +Requires: cockpit-system >= 122 +Requires: libvirt +Requires: libvirt-client +%if 0%{?fedora} +Requires: libvirt-dbus +%endif +# Optional components +%if 0%{?fedora} || 0%{?rhel} >= 8 +Recommends: virt-install +%endif + +%description -n cockpit-machines +The Cockpit components for managing virtual machines. + +If "virt-install" is installed, you can also create new virtual machines. + +%files -n cockpit-machines +%{_datadir}/cockpit/machines + +%package -n cockpit-machines-ovirt +BuildArch: noarch +Summary: Cockpit user interface for oVirt virtual machines +Requires: cockpit-bridge >= 122 +Requires: cockpit-system >= 122 +Requires: libvirt +Requires: libvirt-client + +%description -n cockpit-machines-ovirt +The Cockpit components for managing oVirt virtual machines. + +%files -n cockpit-machines-ovirt +%{_datadir}/cockpit/ovirt + %changelog +* Tue Jan 10 2023 zhangpan - 178-13 +- Type:NA +- Id:NA +- SUG:NA +- DESC:splits subpackages cockpit-machines cockpit-machines-ovirt + * Tue Dec 13 2022 zhouwenpei - 178-12 - strip binary file -- Gitee From 62fe77475ef78671abe44b7ce35534c2dfa188c6 Mon Sep 17 00:00:00 2001 From: zhangpan Date: Wed, 11 Jan 2023 08:02:40 +0000 Subject: [PATCH 2/5] splits subpackages (cherry picked from commit 6d33eb1f04190074abb4951e44057f1ae65e0a8e) --- cockpit.spec | 70 +++++++++++++++++++++++++--------------------------- 1 file changed, 33 insertions(+), 37 deletions(-) diff --git a/cockpit.spec b/cockpit.spec index 09bfeec..2841728 100644 --- a/cockpit.spec +++ b/cockpit.spec @@ -67,6 +67,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: libvirt +Requires: libvirt-client +Requires: libvirt-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: libvirt +Requires: libvirt-client + +%description cockpit-machines-ovirt +The Cockpit components for managing oVirt virtual machines. + %package help Summary: Help package for %{name} BuildArch: noarch @@ -148,7 +174,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 +197,12 @@ test -f %{_bindir}/firewall-cmd && firewall-cmd --reload --quiet || true %{_datadir}/cockpit/playground %{_prefix}/lib/cockpit-test-assets +%files cockpit-machines +%{_datadir}/cockpit/machines + +%files cockpit-machines-ovirt +%{_datadir}/cockpit/ovirt + %files help %{_docdir}/cockpit %exclude %{_docdir}/cockpit/{AUTHORS,COPYING,README.md} @@ -178,42 +210,6 @@ test -f %{_bindir}/firewall-cmd && firewall-cmd --reload --quiet || true %doc %{_mandir}/man5/cockpit.conf.5.gz %doc %{_mandir}/man8/{cockpit-ws.8.gz,remotectl.8.gz,pam_ssh_add.8.gz} -%package -n cockpit-machines -BuildArch: noarch -Summary: Cockpit user interface for virtual machines -Requires: cockpit-bridge >= 122 -Requires: cockpit-system >= 122 -Requires: libvirt -Requires: libvirt-client -%if 0%{?fedora} -Requires: libvirt-dbus -%endif -# Optional components -%if 0%{?fedora} || 0%{?rhel} >= 8 -Recommends: virt-install -%endif - -%description -n cockpit-machines -The Cockpit components for managing virtual machines. - -If "virt-install" is installed, you can also create new virtual machines. - -%files -n cockpit-machines -%{_datadir}/cockpit/machines - -%package -n cockpit-machines-ovirt -BuildArch: noarch -Summary: Cockpit user interface for oVirt virtual machines -Requires: cockpit-bridge >= 122 -Requires: cockpit-system >= 122 -Requires: libvirt -Requires: libvirt-client - -%description -n cockpit-machines-ovirt -The Cockpit components for managing oVirt virtual machines. - -%files -n cockpit-machines-ovirt -%{_datadir}/cockpit/ovirt %changelog * Tue Jan 10 2023 zhangpan - 178-13 -- Gitee From 224a3afcbd39b97d3a98a0a9de02b5200f0f326a Mon Sep 17 00:00:00 2001 From: zhangpan Date: Thu, 12 Jan 2023 06:04:34 +0000 Subject: [PATCH 3/5] splits subpackages (cherry picked from commit e7093a7875fa734c2baf0ff29c786dd1a52c990b) --- cockpit.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/cockpit.spec b/cockpit.spec index 2841728..12b2739 100644 --- a/cockpit.spec +++ b/cockpit.spec @@ -210,7 +210,6 @@ test -f %{_bindir}/firewall-cmd && firewall-cmd --reload --quiet || true %doc %{_mandir}/man5/cockpit.conf.5.gz %doc %{_mandir}/man8/{cockpit-ws.8.gz,remotectl.8.gz,pam_ssh_add.8.gz} - %changelog * Tue Jan 10 2023 zhangpan - 178-13 - Type:NA -- Gitee From 148cc2b74a58b0a793c64c9cc7377fc4c3728017 Mon Sep 17 00:00:00 2001 From: zhangpan Date: Thu, 12 Jan 2023 06:54:02 +0000 Subject: [PATCH 4/5] splits subpackages (cherry picked from commit b8242abc4712a1dd9b7a0dab8b8a33e84f8688a8) --- cockpit.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/cockpit.spec b/cockpit.spec index 12b2739..f5f4fe0 100644 --- a/cockpit.spec +++ b/cockpit.spec @@ -74,7 +74,6 @@ Requires: cockpit-bridge >= 122 Requires: cockpit-system >= 122 Requires: libvirt Requires: libvirt-client -Requires: libvirt-dbus # Optional components Recommends: virt-install -- Gitee From 03584b925d781bba6bf70226758da0ff5cd8d18f Mon Sep 17 00:00:00 2001 From: zhangpan Date: Thu, 12 Jan 2023 07:05:28 +0000 Subject: [PATCH 5/5] splits subpackages (cherry picked from commit 0fc046be2f37fa44901acb052f3f3bc51cdb5957) --- cockpit.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/cockpit.spec b/cockpit.spec index f5f4fe0..2c66ebe 100644 --- a/cockpit.spec +++ b/cockpit.spec @@ -74,8 +74,6 @@ Requires: cockpit-bridge >= 122 Requires: cockpit-system >= 122 Requires: libvirt Requires: libvirt-client -# Optional components -Recommends: virt-install %description cockpit-machines The Cockpit components for managing virtual machines. -- Gitee