From 86a7b3a1ac0cbbfb79e9ad845a9f4b848f8b74b9 Mon Sep 17 00:00:00 2001
From: zhangpan <zp1224248514@163.com>
Date: Wed, 11 Jan 2023 08:02:40 +0000
Subject: [PATCH] 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 <zhangpan@h-partners.com> - 178-13