From b47a5664edcfdc8ce872a14b76eae2e7461f0e214b1232df52b0aa30d32bee7e Mon Sep 17 00:00:00 2001 From: Adam Majer Date: Wed, 24 Jan 2024 12:56:16 +0000 Subject: [PATCH 1/4] - hide-docs.patch: hide RHEL docs in shell/manifest.json - vendor.tar.gz -- submodules in vendor/ subdirectory. These are not part of original tarball because obs service wants to bundle node_modules there too.... OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:cockpit/cockpit?expand=0&rev=153 --- cockpit.changes | 8 ++++++++ hide-docs.patch | 13 +++++++++++++ 2 files changed, 21 insertions(+) diff --git a/cockpit.changes b/cockpit.changes index 4108ae1..0421525 100644 --- a/cockpit.changes +++ b/cockpit.changes @@ -1,7 +1,15 @@ +------------------------------------------------------------------- +Wed Jan 24 12:55:20 UTC 2024 - Adam Majer + +- hide-docs.patch: hide RHEL docs in shell/manifest.json + ------------------------------------------------------------------- Fri Jan 12 16:40:17 UTC 2024 - Adam Majer - enable python-bridge for suse distros +- vendor.tar.gz -- submodules in vendor/ subdirectory. These are not part + of original tarball because obs service wants to bundle node_modules + there too.... ------------------------------------------------------------------- Thu Dec 21 15:22:27 UTC 2023 - Adam Majer - 307 diff --git a/hide-docs.patch b/hide-docs.patch index 71091cc..fa74125 100644 --- a/hide-docs.patch +++ b/hide-docs.patch @@ -109,3 +109,16 @@ Index: cockpit/pkg/users/manifest.json { "label": "Managing user accounts", "url": "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/managing_systems_using_the_rhel_8_web_console/managing-user-accounts-in-the-web-console_system-management-using-the-rhel-8-web-console" +Index: cockpit/pkg/shell/manifest.json +=================================================================== +--- cockpit.orig/pkg/shell/manifest.json ++++ cockpit/pkg/shell/manifest.json +@@ -25,7 +25,7 @@ + "uk-ua": "Українська", + "zh-cn": "中文（中国）" + }, +- "docs": [ ++ "docs-rh": [ + { + "label": "Web Console", + "url": "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/managing_systems_using_the_rhel_8_web_console/index" From 9901532aff23018853f9689322042e0284d4133eb847a099c3a6553a411375b5 Mon Sep 17 00:00:00 2001 From: Adam Majer Date: Thu, 25 Jan 2024 10:03:58 +0000 Subject: [PATCH 2/4] - suse_docs.patch: replace with suse docs and move docs with out eqiv to docs-rh - hide-docs.patch: obsolete by above, removed - Provide users/groups cockpit-wsinstance and cockpit-ws: they are generated by cockpit-ws %pre script. OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:cockpit/cockpit?expand=0&rev=154 --- cockpit.changes | 13 ++++ cockpit.spec | 6 +- hide-docs.patch | 124 ---------------------------------- suse_docs.patch | 174 ++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 192 insertions(+), 125 deletions(-) delete mode 100644 hide-docs.patch create mode 100644 suse_docs.patch diff --git a/cockpit.changes b/cockpit.changes index 0421525..4cc7981 100644 --- a/cockpit.changes +++ b/cockpit.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Thu Jan 25 09:36:45 UTC 2024 - Luna D Dragon + +- suse_docs.patch: replace with suse docs and move docs with out eqiv + to docs-rh +- hide-docs.patch: obsolete by above, removed + +------------------------------------------------------------------- +Thu Jan 25 09:08:12 UTC 2024 - Dominique Leuenberger + +- Provide users/groups cockpit-wsinstance and cockpit-ws: they are + generated by cockpit-ws %pre script. + ------------------------------------------------------------------- Wed Jan 24 12:55:20 UTC 2024 - Adam Majer diff --git a/cockpit.spec b/cockpit.spec index 0d32167..e52dd00 100644 --- a/cockpit.spec +++ b/cockpit.spec @@ -62,7 +62,7 @@ Source98: package-lock.json Source97: node_modules.spec.inc %include %{_sourcedir}/node_modules.spec.inc Patch1: 0001-selinux-allow-login-to-read-motd-file.patch -Patch2: hide-docs.patch +Patch2: suse_docs.patch Patch3: suse-microos-branding.patch Patch4: css-overrides.patch Patch5: storage-btrfs.patch @@ -602,6 +602,10 @@ Requires: wallpaper-branding %endif # for cockpit-desktop Suggests: python3 +Provides: group(cockpit-ws) +Provides: group(cockpit-wsinstance) +Provides: user(cockpit-ws) +Provides: user(cockpit-wsinstance) # prevent hard python3 dependency for cockpit-desktop, it falls back to other browsers %global __requires_exclude_from ^%{_libexecdir}/cockpit-client$ diff --git a/hide-docs.patch b/hide-docs.patch deleted file mode 100644 index fa74125..0000000 --- a/hide-docs.patch +++ /dev/null @@ -1,124 +0,0 @@ -From cf16dead8c862fdf0f61a1c7ac0e8804933c812a Mon Sep 17 00:00:00 2001 -From: Jacek Tomasiak -Date: Mon, 14 Mar 2022 12:02:17 +0100 -Subject: [PATCH] Hide links pointing to RHEL docs (bsc#1197003) - ---- - pkg/kdump/manifest.json | 2 +- - pkg/networkmanager/manifest.json | 2 +- - pkg/packagekit/manifest.json | 2 +- - pkg/shell/indexes.js | 2 +- - pkg/storaged/manifest.json | 2 +- - pkg/systemd/manifest.json | 6 +++--- - pkg/users/manifest.json | 2 +- - 7 files changed, 9 insertions(+), 9 deletions(-) - -Index: cockpit/pkg/kdump/manifest.json -=================================================================== ---- cockpit.orig/pkg/kdump/manifest.json -+++ cockpit/pkg/kdump/manifest.json -@@ -5,7 +5,7 @@ - "tools": { - "index": { - "label": "Kernel dump", -- "docs": [ -+ "docs-rh": [ - { - "label": "Configuring kdump", - "url": "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/managing_systems_using_the_rhel_8_web_console/configuring-kdump-in-the-web-console_system-management-using-the-rhel-8-web-console" -Index: cockpit/pkg/networkmanager/manifest.json -=================================================================== ---- cockpit.orig/pkg/networkmanager/manifest.json -+++ cockpit/pkg/networkmanager/manifest.json -@@ -7,7 +7,7 @@ - "index": { - "label": "Networking", - "order": 40, -- "docs": [ -+ "docs-rh": [ - { - "label": "Managing networking bonds", - "url": "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/managing_systems_using_the_rhel_8_web_console/configuring-network-bonds-using-the-web-console_system-management-using-the-rhel-8-web-console" -Index: cockpit/pkg/packagekit/manifest.json -=================================================================== ---- cockpit.orig/pkg/packagekit/manifest.json -+++ cockpit/pkg/packagekit/manifest.json -@@ -9,7 +9,7 @@ - "tools": { - "index": { - "label": "Software updates", -- "docs": [ -+ "docs-rh": [ - { - "label": "Managing software updates", - "url": "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/managing_systems_using_the_rhel_8_web_console/managing-software-updates-in-the-web-console_system-management-using-the-rhel-8-web-console" -Index: cockpit/pkg/storaged/manifest.json -=================================================================== ---- cockpit.orig/pkg/storaged/manifest.json -+++ cockpit/pkg/storaged/manifest.json -@@ -11,7 +11,7 @@ - "index": { - "label": "Storage", - "order": 30, -- "docs": [ -+ "docs-rh": [ - { - "label": "Managing partitions", - "url": "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/managing_systems_using_the_rhel_8_web_console/managing-partitions-using-the-web-console_system-management-using-the-rhel-8-web-console" -Index: cockpit/pkg/systemd/manifest.json -=================================================================== ---- cockpit.orig/pkg/systemd/manifest.json -+++ cockpit/pkg/systemd/manifest.json -@@ -9,7 +9,7 @@ - "index": { - "label": "Overview", - "order": 10, -- "docs": [ -+ "docs-rh": [ - { - "label": "Configuring system settings", - "url": "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/managing_systems_using_the_rhel_8_web_console/getting-started-with-the-rhel-8-web-console_system-management-using-the-rhel-8-web-console" -@@ -32,7 +32,7 @@ - "services": { - "label": "Services", - "order": 100, -- "docs": [ -+ "docs-rh": [ - { - "label": "Managing services", - "url": "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/managing_systems_using_the_rhel_8_web_console/managing-services-in-the-web-console_system-management-using-the-rhel-8-web-console" -@@ -51,7 +51,7 @@ - "logs": { - "label": "Logs", - "order": 20, -- "docs": [ -+ "docs-rh": [ - { - "label": "Reviewing logs", - "url": "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/managing_systems_using_the_rhel_8_web_console/reviewing-logs_system-management-using-the-rhel-8-web-console" -Index: cockpit/pkg/users/manifest.json -=================================================================== ---- cockpit.orig/pkg/users/manifest.json -+++ cockpit/pkg/users/manifest.json -@@ -3,7 +3,7 @@ - "index": { - "label": "Accounts", - "order": 70, -- "docs": [ -+ "docs-rh": [ - { - "label": "Managing user accounts", - "url": "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/managing_systems_using_the_rhel_8_web_console/managing-user-accounts-in-the-web-console_system-management-using-the-rhel-8-web-console" -Index: cockpit/pkg/shell/manifest.json -=================================================================== ---- cockpit.orig/pkg/shell/manifest.json -+++ cockpit/pkg/shell/manifest.json -@@ -25,7 +25,7 @@ - "uk-ua": "Українська", - "zh-cn": "中文（中国）" - }, -- "docs": [ -+ "docs-rh": [ - { - "label": "Web Console", - "url": "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/managing_systems_using_the_rhel_8_web_console/index" diff --git a/suse_docs.patch b/suse_docs.patch new file mode 100644 index 0000000..a4e2f2d --- /dev/null +++ b/suse_docs.patch @@ -0,0 +1,174 @@ +From adadbac839dc6d549a3a9b75ae1f8c422e82fa7c Mon Sep 17 00:00:00 2001 +From: Luna +Date: Thu, 25 Jan 2024 10:06:03 +0530 +Subject: [PATCH] replace with suse docs and move docs with out eqiv to docs-rh +​ +--- + node_modules | 2 +- + pkg/networkmanager/manifest.json | 19 +++++++++++-------- + pkg/shell/manifest.json | 4 ++-- + pkg/storaged/manifest.json | 12 +++++++----- + pkg/systemd/manifest.json | 6 +++--- + pkg/users/manifest.json | 2 +- + 6 files changed, 25 insertions(+), 20 deletions(-) + +Index: cockpit/pkg/kdump/manifest.json +=================================================================== +--- cockpit.orig/pkg/kdump/manifest.json ++++ cockpit/pkg/kdump/manifest.json +@@ -5,7 +5,7 @@ + "tools": { + "index": { + "label": "Kernel dump", +- "docs": [ ++ "docs-rh": [ + { + "label": "Configuring kdump", + "url": "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/managing_systems_using_the_rhel_8_web_console/configuring-kdump-in-the-web-console_system-management-using-the-rhel-8-web-console" +Index: cockpit/pkg/networkmanager/manifest.json +=================================================================== +--- cockpit.orig/pkg/networkmanager/manifest.json ++++ cockpit/pkg/networkmanager/manifest.json +@@ -10,23 +10,25 @@ + "docs": [ + { + "label": "Managing networking bonds", +- "url": "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/managing_systems_using_the_rhel_8_web_console/configuring-network-bonds-using-the-web-console_system-management-using-the-rhel-8-web-console" +- }, +- { +- "label": "Managing networking teams", +- "url": "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/managing_systems_using_the_rhel_8_web_console/configuring-network-teams-using-the-web-console_system-management-using-the-rhel-8-web-console" ++ "url": "https://documentation.suse.com/smart/systems-management/html/cockpit-slemicro/index.html#cockpit-managing-bonds" + }, + { + "label": "Managing networking bridges", +- "url": "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/managing_systems_using_the_rhel_8_web_console/configuring-network-bridges-in-the-web-console_system-management-using-the-rhel-8-web-console" ++ "url": "https://documentation.suse.com/smart/systems-management/html/cockpit-slemicro/index.html#task-managing-bridges" + }, + { + "label": "Managing VLANs", +- "url": "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/managing_systems_using_the_rhel_8_web_console/configuring-vlans-in-the-web-console_system-management-using-the-rhel-8-web-console" ++ "url": "https://documentation.suse.com/smart/systems-management/html/cockpit-slemicro/index.html#task-managing-vlans" + }, + { + "label": "Managing firewall", +- "url": "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/managing_systems_using_the_rhel_8_web_console/managing_firewall_using_the_web_console" ++ "url": "https://documentation.suse.com/smart/systems-management/html/cockpit-slemicro/index.html#task-managing-firewall-cockpit" ++ } ++ ], ++ "docs-rh": [ ++ { ++ "label": "Managing networking teams", ++ "url": "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/managing_systems_using_the_rhel_8_web_console/configuring-network-teams-using-the-web-console_system-management-using-the-rhel-8-web-console" + } + ], + "keywords": [ +Index: cockpit/pkg/packagekit/manifest.json +=================================================================== +--- cockpit.orig/pkg/packagekit/manifest.json ++++ cockpit/pkg/packagekit/manifest.json +@@ -9,7 +9,7 @@ + "tools": { + "index": { + "label": "Software updates", +- "docs": [ ++ "docs-rh": [ + { + "label": "Managing software updates", + "url": "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/managing_systems_using_the_rhel_8_web_console/managing-software-updates-in-the-web-console_system-management-using-the-rhel-8-web-console" +Index: cockpit/pkg/storaged/manifest.json +=================================================================== +--- cockpit.orig/pkg/storaged/manifest.json ++++ cockpit/pkg/storaged/manifest.json +@@ -14,20 +14,22 @@ + "docs": [ + { + "label": "Managing partitions", +- "url": "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/managing_systems_using_the_rhel_8_web_console/managing-partitions-using-the-web-console_system-management-using-the-rhel-8-web-console" ++ "url": "https://documentation.suse.com/smart/systems-management/html/cockpit-slemicro/index.html#glue-cockpit-managing-filesystems" + }, + { + "label": "Managing NFS mounts", +- "url": "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/managing_systems_using_the_rhel_8_web_console/managing-nfs-mounts-in-the-web-console_system-management-using-the-rhel-8-web-console" ++ "url": "https://documentation.suse.com/smart/systems-management/html/cockpit-slemicro/index.html#task-managing-NFS-mounts" + }, + { + "label": "Managing RAIDs", +- "url": "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/managing_systems_using_the_rhel_8_web_console/managing-redundant-arrays-of-independent-disks-in-the-web-console_system-management-using-the-rhel-8-web-console" ++ "url": "https://documentation.suse.com/smart/systems-management/html/cockpit-slemicro/index.html#id-1.7.6" + }, + { + "label": "Managing LVMs", +- "url": "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/managing_systems_using_the_rhel_8_web_console/using-the-web-console-for-configuring-lvm-logical-volumes_system-management-using-the-rhel-8-web-console" +- }, ++ "url": "https://documentation.suse.com/smart/systems-management/html/cockpit-slemicro/index.html#id-1.7.7" ++ } ++ ], ++ "docs-rh": [ + { + "label": "Managing physical drives", + "url": "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/managing_systems_using_the_rhel_8_web_console/using-the-web-console-for-changing-physical-drives-in-volume-groups_system-management-using-the-rhel-8-web-console" +Index: cockpit/pkg/systemd/manifest.json +=================================================================== +--- cockpit.orig/pkg/systemd/manifest.json ++++ cockpit/pkg/systemd/manifest.json +@@ -12,7 +12,7 @@ + "docs": [ + { + "label": "Configuring system settings", +- "url": "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/managing_systems_using_the_rhel_8_web_console/getting-started-with-the-rhel-8-web-console_system-management-using-the-rhel-8-web-console" ++ "url": "https://documentation.suse.com/smart/systems-management/html/cockpit-slemicro/index.html#cockpit-configuring-servers" + } + ], + "keywords": [ +@@ -35,7 +35,7 @@ + "docs": [ + { + "label": "Managing services", +- "url": "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/managing_systems_using_the_rhel_8_web_console/managing-services-in-the-web-console_system-management-using-the-rhel-8-web-console" ++ "url": "https://documentation.suse.com/smart/systems-management/html/cockpit-slemicro/index.html#glue-services-management" + } + ], + "keywords": [ +@@ -54,7 +54,7 @@ + "docs": [ + { + "label": "Reviewing logs", +- "url": "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/managing_systems_using_the_rhel_8_web_console/reviewing-logs_system-management-using-the-rhel-8-web-console" ++ "url": "https://documentation.suse.com/smart/systems-management/html/cockpit-slemicro/index.html#cockpit-filtering-logs" + } + ], + "keywords": [ +Index: cockpit/pkg/users/manifest.json +=================================================================== +--- cockpit.orig/pkg/users/manifest.json ++++ cockpit/pkg/users/manifest.json +@@ -6,7 +6,7 @@ + "docs": [ + { + "label": "Managing user accounts", +- "url": "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/managing_systems_using_the_rhel_8_web_console/managing-user-accounts-in-the-web-console_system-management-using-the-rhel-8-web-console" ++ "url": "https://documentation.suse.com/smart/systems-management/html/cockpit-slemicro/index.html#glue-managing-users" + } + ], + "keywords": [ +Index: cockpit/pkg/shell/manifest.json +=================================================================== +--- cockpit.orig/pkg/shell/manifest.json ++++ cockpit/pkg/shell/manifest.json +@@ -25,7 +25,7 @@ + "uk-ua": "Українська", + "zh-cn": "中文（中国）" + }, +- "docs": [ ++ "docs-rh": [ + { + "label": "Web Console", + "url": "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/managing_systems_using_the_rhel_8_web_console/index" +@@ -55,4 +55,4 @@ + ] + } + ] +-} ++} +\ No newline at end of file From bbef189e7eb631a0e79403e7dfa9a2aa04974364484025bdf2bcf025ad1e5188 Mon Sep 17 00:00:00 2001 From: Adam Majer Date: Fri, 26 Jan 2024 11:16:42 +0000 Subject: [PATCH 3/4] to docs-rh (bsc#1219088) OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:cockpit/cockpit?expand=0&rev=155 --- cockpit.changes | 2 +- cockpit.spec | 334 +++++++++++++++++++++++------------------------- 2 files changed, 162 insertions(+), 174 deletions(-) diff --git a/cockpit.changes b/cockpit.changes index 4cc7981..095bc70 100644 --- a/cockpit.changes +++ b/cockpit.changes @@ -2,7 +2,7 @@ Thu Jan 25 09:36:45 UTC 2024 - Luna D Dragon - suse_docs.patch: replace with suse docs and move docs with out eqiv - to docs-rh + to docs-rh (bsc#1219088) - hide-docs.patch: obsolete by above, removed ------------------------------------------------------------------- diff --git a/cockpit.spec b/cockpit.spec index e52dd00..40a0d33 100644 --- a/cockpit.spec +++ b/cockpit.spec @@ -1,32 +1,22 @@ # +# spec file for package cockpit +# +# Copyright (c) 2024 SUSE LLC # Copyright (C) 2014-2020 Red Hat, Inc. # -# Cockpit is free software; you can redistribute it and/or modify it -# under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation; either version 2.1 of the License, or -# (at your option) any later version. -# -# Cockpit is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with Cockpit; If not, see . +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # -# -# This file is maintained at the following location: -# https://github.com/cockpit-project/cockpit/blob/main/tools/cockpit.spec -# -# If you are editing this file in another location, changes will likely -# be clobbered the next time an automated release is done. -# -# Check first cockpit-devel@lists.fedorahosted.org -# -# earliest base that the subpackages work on; this is still required as long as -# we maintain the basic/optional split, then it can be replaced with just %{version}. %define required_base 266 # we generally want CentOS packages to be like RHEL; special cases need to check %{centos} explicitly @@ -131,67 +121,68 @@ Patch104: selinux_libdir.patch %endif %endif -BuildRequires: gcc -BuildRequires: pkgconfig(gio-unix-2.0) -BuildRequires: pkgconfig(json-glib-1.0) -BuildRequires: pkgconfig(polkit-agent-1) >= 0.105 -BuildRequires: pam-devel +BuildRequires: gcc +BuildRequires: pam-devel +BuildRequires: pkgconfig(gio-unix-2.0) +BuildRequires: pkgconfig(json-glib-1.0) +BuildRequires: pkgconfig(polkit-agent-1) >= 0.105 -BuildRequires: autoconf automake -BuildRequires: make -BuildRequires: /usr/bin/python3 -BuildRequires: python3-devel +BuildRequires: /usr/bin/python3 +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: make +BuildRequires: python3-devel %if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || 0%{?suse_version} <= 1500 # RHEL 8's gettext does not yet have metainfo.its -BuildRequires: gettext >= 0.19.7 +BuildRequires: gettext >= 0.19.7 %if 0%{?rhel} -BuildRequires: libappstream-glib-devel +BuildRequires: libappstream-glib-devel %else # Suse's package has a different name -BuildRequires: appstream-glib-devel +BuildRequires: appstream-glib-devel %endif %else -BuildRequires: gettext >= 0.21 +BuildRequires: gettext >= 0.21 %endif %if 0%{?build_basic} -BuildRequires: libssh-devel >= 0.8.5 +BuildRequires: libssh-devel >= 0.8.5 %endif -BuildRequires: openssl-devel -BuildRequires: gnutls-devel >= 3.4.3 -BuildRequires: zlib-devel -BuildRequires: pkgconfig(krb5) >= 1.11 -BuildRequires: libxslt-devel -BuildRequires: glib-networking -BuildRequires: sed +BuildRequires: glib-networking +BuildRequires: gnutls-devel >= 3.4.3 +BuildRequires: libxslt-devel +BuildRequires: openssl-devel +BuildRequires: sed +BuildRequires: zlib-devel +BuildRequires: pkgconfig(krb5) >= 1.11 -BuildRequires: glib2-devel >= 2.50.0 +BuildRequires: glib2-devel >= 2.50.0 # this is for runtimedir in the tls proxy ace21c8879 -BuildRequires: pkgconfig(libsystemd) >= 235 +BuildRequires: pkgconfig(libsystemd) >= 235 %if 0%{?suse_version} -BuildRequires: distribution-release +BuildRequires: distribution-release %if %{build_pcp} -BuildRequires: libpcp-devel -BuildRequires: pcp-devel -BuildRequires: libpcp3 -BuildRequires: libpcp_import1 +BuildRequires: libpcp-devel +BuildRequires: libpcp3 +BuildRequires: libpcp_import1 +BuildRequires: pcp-devel %endif -BuildRequires: openssh -BuildRequires: distribution-logos -BuildRequires: wallpaper-branding +BuildRequires: distribution-logos +BuildRequires: openssh +BuildRequires: wallpaper-branding # needed for /var/lib/pcp directory ownership -BuildRequires: pcp +BuildRequires: pcp %else %if %{build_pcp} -BuildRequires: pcp-libs-devel +BuildRequires: pcp-libs-devel %endif -BuildRequires: openssh-clients -BuildRequires: docbook-style-xsl +BuildRequires: docbook-style-xsl +BuildRequires: openssh-clients %endif -BuildRequires: krb5-server -BuildRequires: gdb +BuildRequires: gdb +BuildRequires: krb5-server # For documentation -BuildRequires: xmlto +BuildRequires: xmlto %if 0%{?with_selinux} BuildRequires: selinux-policy @@ -200,30 +191,30 @@ BuildRequires: selinux-policy-devel %endif # for rebuilding nodejs bits -BuildRequires: npm -BuildRequires: sassc -BuildRequires: local-npm-registry +BuildRequires: npm +BuildRequires: local-npm-registry +BuildRequires: sassc # This is the "cockpit" metapackage. It should only # Require, Suggest or Recommend other cockpit-xxx subpackages -Requires: cockpit-bridge -Requires: cockpit-ws -Requires: cockpit-system +Requires: cockpit-bridge +Requires: cockpit-system +Requires: cockpit-ws # Optional components -Recommends: (cockpit-storaged if udisks2) -Recommends: (cockpit-packagekit if dnf) -Suggests: cockpit-pcp +Recommends: (cockpit-storaged if udisks2) +Recommends: (cockpit-packagekit if dnf) +Suggests: cockpit-pcp %if 0%{?rhel} == 0 -Recommends: (cockpit-networkmanager if NetworkManager) +Recommends: (cockpit-networkmanager if NetworkManager) # c-ostree is not in RHEL 8/9 -Recommends: (cockpit-ostree if rpm-ostree) -Suggests: cockpit-selinux +Recommends: (cockpit-ostree if rpm-ostree) +Suggests: cockpit-selinux %endif %if 0%{?rhel} && 0%{?centos} == 0 -Requires: subscription-manager-cockpit +Requires: subscription-manager-cockpit %endif %if 0%{?enable_old_bridge} == 0 @@ -295,7 +286,6 @@ autoreconf -fvi -I tools --disable-pcp \ %endif - %if 0%{?with_selinux} make -f /usr/share/selinux/devel/Makefile cockpit.pp bzip2 -9 cockpit.pp @@ -502,18 +492,17 @@ troubleshooting, interactive command-line sessions, and more. %{_datadir}/pixmaps/cockpit.png %doc %{_mandir}/man1/cockpit.1.gz - %package bridge -Summary: Cockpit bridge server-side component -Requires: glib-networking -Provides: cockpit-ssh = %{version}-%{release} +Summary: Cockpit bridge server-side component +Requires: glib-networking +Provides: cockpit-ssh = %{version}-%{release} # 233 dropped jquery.js, pages started to bundle it (commit 049e8b8dce) -Conflicts: cockpit-dashboard < 233 -Conflicts: cockpit-networkmanager < 233 -Conflicts: cockpit-storaged < 233 -Conflicts: cockpit-system < 233 -Conflicts: cockpit-tests < 233 -Conflicts: cockpit-docker < 233 +Conflicts: cockpit-dashboard < 233 +Conflicts: cockpit-docker < 233 +Conflicts: cockpit-networkmanager < 233 +Conflicts: cockpit-storaged < 233 +Conflicts: cockpit-system < 233 +Conflicts: cockpit-tests < 233 %description bridge The Cockpit bridge component installed server side and runs commands on the @@ -528,8 +517,8 @@ system on behalf of the web based user interface. %endif %package doc -Summary: Cockpit deployment and developer guide -BuildArch: noarch +Summary: Cockpit deployment and developer guide +BuildArch: noarch %description doc The Cockpit Deployment and Developer Guide shows sysadmins how to @@ -543,35 +532,35 @@ embed or extend Cockpit. %{_docdir}/cockpit %package system -Summary: Cockpit admin interface package for configuring and troubleshooting a system -BuildArch: noarch -Requires: cockpit-bridge >= %{version}-%{release} +Summary: Cockpit admin interface package for configuring and troubleshooting a system +BuildArch: noarch +Requires: cockpit-bridge >= %{version}-%{release} %if !0%{?suse_version} -Requires: shadow-utils +Requires: shadow-utils %endif -Requires: grep -Requires: /usr/bin/pwscore -Requires: /usr/bin/date -Provides: cockpit-shell = %{version}-%{release} -Provides: cockpit-systemd = %{version}-%{release} -Provides: cockpit-tuned = %{version}-%{release} -Provides: cockpit-users = %{version}-%{release} -Obsoletes: cockpit-dashboard < %{version}-%{release} +Requires: /usr/bin/date +Requires: /usr/bin/pwscore +Requires: grep +Provides: cockpit-shell = %{version}-%{release} +Provides: cockpit-systemd = %{version}-%{release} +Provides: cockpit-tuned = %{version}-%{release} +Provides: cockpit-users = %{version}-%{release} +Obsoletes: cockpit-dashboard < %{version}-%{release} %if 0%{?rhel} -Requires: NetworkManager >= 1.6 -Requires: kexec-tools -Requires: sos -Requires: sudo -Recommends: PackageKit -Recommends: setroubleshoot-server >= 3.3.3 -Suggests: NetworkManager-team -Provides: cockpit-kdump = %{version}-%{release} -Provides: cockpit-networkmanager = %{version}-%{release} -Provides: cockpit-selinux = %{version}-%{release} -Provides: cockpit-sosreport = %{version}-%{release} +Requires: NetworkManager >= 1.6 +Requires: kexec-tools +Requires: sos +Requires: sudo +Recommends: PackageKit +Recommends: setroubleshoot-server >= 3.3.3 +Suggests: NetworkManager-team +Provides: cockpit-kdump = %{version}-%{release} +Provides: cockpit-networkmanager = %{version}-%{release} +Provides: cockpit-selinux = %{version}-%{release} +Provides: cockpit-sosreport = %{version}-%{release} %endif %if 0%{?fedora} -Recommends: (reportd if abrt) +Recommends: (reportd if abrt) %endif #NPM_PROVIDES @@ -583,25 +572,25 @@ This package contains the Cockpit shell and system configuration interfaces. %dir %{_datadir}/cockpit/shell/images %package ws -Summary: Cockpit Web Service -Requires: glib-networking -Requires: openssl -Requires: glib2 >= 2.50.0 +Summary: Cockpit Web Service +Requires: glib-networking +Requires: glib2 >= 2.50.0 +Requires: openssl %if 0%{?with_selinux} -Requires: (selinux-policy >= %{_selinux_policy_version} if selinux-policy-%{selinuxtype}) +Requires: (selinux-policy >= %{_selinux_policy_version} if selinux-policy-%{selinuxtype}) Requires(post): (policycoreutils if selinux-policy-%{selinuxtype}) %endif -Conflicts: firewalld < 0.6.0-1 -Recommends: sscg >= 2.3 -Recommends: system-logos -Suggests: sssd-dbus +Conflicts: firewalld < 0.6.0-1 +Recommends: sscg >= 2.3 +Recommends: system-logos +Suggests: sssd-dbus %if 0%{?suse_version} -Requires(pre): permissions -Requires: distribution-logos -Requires: wallpaper-branding +Requires(pre): permissions +Requires: distribution-logos +Requires: wallpaper-branding %endif # for cockpit-desktop -Suggests: python3 +Suggests: python3 Provides: group(cockpit-ws) Provides: group(cockpit-wsinstance) Provides: user(cockpit-ws) @@ -755,11 +744,11 @@ done %if 0%{?rhel} == 0 %package kdump -Summary: Cockpit user interface for kernel crash dumping -Requires: cockpit-bridge >= %{required_base} -Requires: cockpit-shell >= %{required_base} -Requires: kexec-tools -BuildArch: noarch +Summary: Cockpit user interface for kernel crash dumping +Requires: cockpit-bridge >= %{required_base} +Requires: cockpit-shell >= %{required_base} +Requires: kexec-tools +BuildArch: noarch %description kdump The Cockpit component for configuring kernel crash dumping. @@ -769,11 +758,11 @@ The Cockpit component for configuring kernel crash dumping. %if !0%{?suse_version} %package sosreport -Summary: Cockpit user interface for diagnostic reports -Requires: cockpit-bridge >= %{required_base} -Requires: cockpit-shell >= %{required_base} -Requires: sos -BuildArch: noarch +Summary: Cockpit user interface for diagnostic reports +Requires: cockpit-bridge >= %{required_base} +Requires: cockpit-shell >= %{required_base} +Requires: sos +BuildArch: noarch %description sosreport The Cockpit component for creating diagnostic reports with the @@ -785,14 +774,14 @@ sosreport tool. %endif %package networkmanager -Summary: Cockpit user interface for networking, using NetworkManager -Requires: cockpit-bridge >= %{required_base} -Requires: cockpit-shell >= %{required_base} -Requires: NetworkManager >= 1.6 -Conflicts: cockpit-wicked +Summary: Cockpit user interface for networking, using NetworkManager +Requires: NetworkManager >= 1.6 +Requires: cockpit-bridge >= %{required_base} +Requires: cockpit-shell >= %{required_base} +Conflicts: cockpit-wicked # Optional components -Recommends: NetworkManager-team -BuildArch: noarch +Recommends: NetworkManager-team +BuildArch: noarch %description networkmanager The Cockpit component for managing networking. This package uses NetworkManager. @@ -805,9 +794,9 @@ The Cockpit component for managing networking. This package uses NetworkManager %if 0%{?rhel} == 0 && ( 0%{?suse_version} >= 1500 || 0%{?is_smo} ) %package selinux -Summary: Cockpit SELinux package -Requires: cockpit-bridge >= %{required_base} -Requires: cockpit-shell >= %{required_base} +Summary: Cockpit SELinux package +Requires: cockpit-bridge >= %{required_base} +Requires: cockpit-shell >= %{required_base} Requires: policycoreutils-python-utils >= 3.1 # setroubleshoot is available on SLE Micro starting with 5.5) %if !0%{?is_smo} || ( 0%{?is_smo} && 0%{?sle_version} >= 150500 ) @@ -840,22 +829,22 @@ Dummy package from building optional packages only; never install or publish me. %if 0%{?build_optional} %package -n cockpit-storaged -Summary: Cockpit user interface for storage, using udisks -Requires: cockpit-shell >= %{required_base} -Requires: udisks2 >= 2.9 -Requires: %{__python3} +Summary: Cockpit user interface for storage, using udisks +Requires: %{__python3} +Requires: cockpit-shell >= %{required_base} +Requires: udisks2 >= 2.9 %if 0%{?suse_version} -Requires: libudisks2-0_lvm2 >= 2.9 -Recommends: multipath-tools -Requires: python3-dbus-python +Requires: libudisks2-0_lvm2 >= 2.9 +Recommends: multipath-tools +Requires: python3-dbus-python %else -Recommends: udisks2-lvm2 >= 2.9 -Recommends: udisks2-iscsi >= 2.9 -Recommends: device-mapper-multipath -Recommends: clevis-luks -Requires: python3-dbus +Recommends: clevis-luks +Recommends: device-mapper-multipath +Recommends: udisks2-iscsi >= 2.9 +Recommends: udisks2-lvm2 >= 2.9 +Requires: python3-dbus %endif -BuildArch: noarch +BuildArch: noarch %description -n cockpit-storaged The Cockpit component for managing storage. This package uses udisks. @@ -865,11 +854,11 @@ The Cockpit component for managing storage. This package uses udisks. %if 0%{?build_tests} %package -n cockpit-tests -Summary: Tests for Cockpit -Requires: cockpit-bridge >= %{required_base} -Requires: cockpit-system >= %{required_base} -Requires: openssh-clients -Provides: cockpit-test-assets = %{version}-%{release} +Summary: Tests for Cockpit +Requires: cockpit-bridge >= %{required_base} +Requires: cockpit-system >= %{required_base} +Requires: openssh-clients +Provides: cockpit-test-assets = %{version}-%{release} %description -n cockpit-tests This package contains tests and files used while testing Cockpit. @@ -884,7 +873,7 @@ These files are not required for running Cockpit. %endif %package devel -Summary: Development files for for Cockpit +Summary: Development files for for Cockpit %description devel This package contains files used to develop cockpit modules @@ -894,9 +883,9 @@ This package contains files used to develop cockpit modules %if %{build_pcp} %package -n cockpit-pcp -Summary: Cockpit PCP integration -Requires: cockpit-bridge >= %{required_base} -Requires: pcp +Summary: Cockpit PCP integration +Requires: cockpit-bridge >= %{required_base} +Requires: pcp %description -n cockpit-pcp Cockpit support for reading PCP metrics and loading PCP archives. @@ -911,13 +900,13 @@ systemctl reload-or-try-restart pmlogger %endif %package -n cockpit-packagekit -Summary: Cockpit user interface for packages -BuildArch: noarch -Requires: cockpit-bridge >= %{required_base} -Requires: PackageKit -Recommends: python3-tracer +Summary: Cockpit user interface for packages +BuildArch: noarch +Requires: PackageKit +Requires: cockpit-bridge >= %{required_base} +Recommends: python3-tracer # HACK: https://bugzilla.redhat.com/show_bug.cgi?id=1800468 -Requires: polkit +Requires: polkit %description -n cockpit-packagekit The Cockpit components for installing OS updates and Cockpit add-ons, @@ -928,5 +917,4 @@ via PackageKit. #/ build optional extension packages %endif -# The changelog is automatically generated and merged %changelog From 1e51b1ef6cf301f7ec402c233a150388568746ca56a21761eec2ef4c9737d9c0 Mon Sep 17 00:00:00 2001 From: Adam Majer Date: Fri, 26 Jan 2024 11:17:14 +0000 Subject: [PATCH 4/4] revert spec-cleaner .... OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:cockpit/cockpit?expand=0&rev=156 --- cockpit.spec | 334 ++++++++++++++++++++++++++------------------------- 1 file changed, 173 insertions(+), 161 deletions(-) diff --git a/cockpit.spec b/cockpit.spec index 40a0d33..e52dd00 100644 --- a/cockpit.spec +++ b/cockpit.spec @@ -1,22 +1,32 @@ # -# spec file for package cockpit -# -# Copyright (c) 2024 SUSE LLC # Copyright (C) 2014-2020 Red Hat, Inc. # -# All modifications and additions to the file contributed by third parties -# remain the property of their copyright owners, unless otherwise agreed -# upon. The license for this file, and modifications and additions to the -# file, is the same license as for the pristine package itself (unless the -# license for the pristine package is not an Open Source License, in which -# case the license is the MIT License). An "Open Source License" is a -# license that conforms to the Open Source Definition (Version 1.9) -# published by the Open Source Initiative. - -# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# Cockpit is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2.1 of the License, or +# (at your option) any later version. +# +# Cockpit is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with Cockpit; If not, see . # +# +# This file is maintained at the following location: +# https://github.com/cockpit-project/cockpit/blob/main/tools/cockpit.spec +# +# If you are editing this file in another location, changes will likely +# be clobbered the next time an automated release is done. +# +# Check first cockpit-devel@lists.fedorahosted.org +# +# earliest base that the subpackages work on; this is still required as long as +# we maintain the basic/optional split, then it can be replaced with just %{version}. %define required_base 266 # we generally want CentOS packages to be like RHEL; special cases need to check %{centos} explicitly @@ -121,68 +131,67 @@ Patch104: selinux_libdir.patch %endif %endif -BuildRequires: gcc -BuildRequires: pam-devel -BuildRequires: pkgconfig(gio-unix-2.0) -BuildRequires: pkgconfig(json-glib-1.0) -BuildRequires: pkgconfig(polkit-agent-1) >= 0.105 +BuildRequires: gcc +BuildRequires: pkgconfig(gio-unix-2.0) +BuildRequires: pkgconfig(json-glib-1.0) +BuildRequires: pkgconfig(polkit-agent-1) >= 0.105 +BuildRequires: pam-devel -BuildRequires: /usr/bin/python3 -BuildRequires: autoconf -BuildRequires: automake -BuildRequires: make -BuildRequires: python3-devel +BuildRequires: autoconf automake +BuildRequires: make +BuildRequires: /usr/bin/python3 +BuildRequires: python3-devel %if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || 0%{?suse_version} <= 1500 # RHEL 8's gettext does not yet have metainfo.its -BuildRequires: gettext >= 0.19.7 +BuildRequires: gettext >= 0.19.7 %if 0%{?rhel} -BuildRequires: libappstream-glib-devel +BuildRequires: libappstream-glib-devel %else # Suse's package has a different name -BuildRequires: appstream-glib-devel +BuildRequires: appstream-glib-devel %endif %else -BuildRequires: gettext >= 0.21 +BuildRequires: gettext >= 0.21 %endif %if 0%{?build_basic} -BuildRequires: libssh-devel >= 0.8.5 +BuildRequires: libssh-devel >= 0.8.5 %endif -BuildRequires: glib-networking -BuildRequires: gnutls-devel >= 3.4.3 -BuildRequires: libxslt-devel -BuildRequires: openssl-devel -BuildRequires: sed -BuildRequires: zlib-devel -BuildRequires: pkgconfig(krb5) >= 1.11 +BuildRequires: openssl-devel +BuildRequires: gnutls-devel >= 3.4.3 +BuildRequires: zlib-devel +BuildRequires: pkgconfig(krb5) >= 1.11 +BuildRequires: libxslt-devel +BuildRequires: glib-networking +BuildRequires: sed -BuildRequires: glib2-devel >= 2.50.0 +BuildRequires: glib2-devel >= 2.50.0 # this is for runtimedir in the tls proxy ace21c8879 -BuildRequires: pkgconfig(libsystemd) >= 235 +BuildRequires: pkgconfig(libsystemd) >= 235 %if 0%{?suse_version} -BuildRequires: distribution-release +BuildRequires: distribution-release %if %{build_pcp} -BuildRequires: libpcp-devel -BuildRequires: libpcp3 -BuildRequires: libpcp_import1 -BuildRequires: pcp-devel +BuildRequires: libpcp-devel +BuildRequires: pcp-devel +BuildRequires: libpcp3 +BuildRequires: libpcp_import1 %endif -BuildRequires: distribution-logos -BuildRequires: openssh -BuildRequires: wallpaper-branding +BuildRequires: openssh +BuildRequires: distribution-logos +BuildRequires: wallpaper-branding # needed for /var/lib/pcp directory ownership -BuildRequires: pcp +BuildRequires: pcp %else %if %{build_pcp} -BuildRequires: pcp-libs-devel +BuildRequires: pcp-libs-devel %endif -BuildRequires: docbook-style-xsl -BuildRequires: openssh-clients +BuildRequires: openssh-clients +BuildRequires: docbook-style-xsl %endif -BuildRequires: gdb -BuildRequires: krb5-server +BuildRequires: krb5-server +BuildRequires: gdb # For documentation -BuildRequires: xmlto +BuildRequires: xmlto %if 0%{?with_selinux} BuildRequires: selinux-policy @@ -191,30 +200,30 @@ BuildRequires: selinux-policy-devel %endif # for rebuilding nodejs bits -BuildRequires: npm -BuildRequires: local-npm-registry -BuildRequires: sassc +BuildRequires: npm +BuildRequires: sassc +BuildRequires: local-npm-registry # This is the "cockpit" metapackage. It should only # Require, Suggest or Recommend other cockpit-xxx subpackages -Requires: cockpit-bridge -Requires: cockpit-system -Requires: cockpit-ws +Requires: cockpit-bridge +Requires: cockpit-ws +Requires: cockpit-system # Optional components -Recommends: (cockpit-storaged if udisks2) -Recommends: (cockpit-packagekit if dnf) -Suggests: cockpit-pcp +Recommends: (cockpit-storaged if udisks2) +Recommends: (cockpit-packagekit if dnf) +Suggests: cockpit-pcp %if 0%{?rhel} == 0 -Recommends: (cockpit-networkmanager if NetworkManager) +Recommends: (cockpit-networkmanager if NetworkManager) # c-ostree is not in RHEL 8/9 -Recommends: (cockpit-ostree if rpm-ostree) -Suggests: cockpit-selinux +Recommends: (cockpit-ostree if rpm-ostree) +Suggests: cockpit-selinux %endif %if 0%{?rhel} && 0%{?centos} == 0 -Requires: subscription-manager-cockpit +Requires: subscription-manager-cockpit %endif %if 0%{?enable_old_bridge} == 0 @@ -286,6 +295,7 @@ autoreconf -fvi -I tools --disable-pcp \ %endif + %if 0%{?with_selinux} make -f /usr/share/selinux/devel/Makefile cockpit.pp bzip2 -9 cockpit.pp @@ -492,17 +502,18 @@ troubleshooting, interactive command-line sessions, and more. %{_datadir}/pixmaps/cockpit.png %doc %{_mandir}/man1/cockpit.1.gz + %package bridge -Summary: Cockpit bridge server-side component -Requires: glib-networking -Provides: cockpit-ssh = %{version}-%{release} +Summary: Cockpit bridge server-side component +Requires: glib-networking +Provides: cockpit-ssh = %{version}-%{release} # 233 dropped jquery.js, pages started to bundle it (commit 049e8b8dce) -Conflicts: cockpit-dashboard < 233 -Conflicts: cockpit-docker < 233 -Conflicts: cockpit-networkmanager < 233 -Conflicts: cockpit-storaged < 233 -Conflicts: cockpit-system < 233 -Conflicts: cockpit-tests < 233 +Conflicts: cockpit-dashboard < 233 +Conflicts: cockpit-networkmanager < 233 +Conflicts: cockpit-storaged < 233 +Conflicts: cockpit-system < 233 +Conflicts: cockpit-tests < 233 +Conflicts: cockpit-docker < 233 %description bridge The Cockpit bridge component installed server side and runs commands on the @@ -517,8 +528,8 @@ system on behalf of the web based user interface. %endif %package doc -Summary: Cockpit deployment and developer guide -BuildArch: noarch +Summary: Cockpit deployment and developer guide +BuildArch: noarch %description doc The Cockpit Deployment and Developer Guide shows sysadmins how to @@ -532,35 +543,35 @@ embed or extend Cockpit. %{_docdir}/cockpit %package system -Summary: Cockpit admin interface package for configuring and troubleshooting a system -BuildArch: noarch -Requires: cockpit-bridge >= %{version}-%{release} +Summary: Cockpit admin interface package for configuring and troubleshooting a system +BuildArch: noarch +Requires: cockpit-bridge >= %{version}-%{release} %if !0%{?suse_version} -Requires: shadow-utils +Requires: shadow-utils %endif -Requires: /usr/bin/date -Requires: /usr/bin/pwscore -Requires: grep -Provides: cockpit-shell = %{version}-%{release} -Provides: cockpit-systemd = %{version}-%{release} -Provides: cockpit-tuned = %{version}-%{release} -Provides: cockpit-users = %{version}-%{release} -Obsoletes: cockpit-dashboard < %{version}-%{release} +Requires: grep +Requires: /usr/bin/pwscore +Requires: /usr/bin/date +Provides: cockpit-shell = %{version}-%{release} +Provides: cockpit-systemd = %{version}-%{release} +Provides: cockpit-tuned = %{version}-%{release} +Provides: cockpit-users = %{version}-%{release} +Obsoletes: cockpit-dashboard < %{version}-%{release} %if 0%{?rhel} -Requires: NetworkManager >= 1.6 -Requires: kexec-tools -Requires: sos -Requires: sudo -Recommends: PackageKit -Recommends: setroubleshoot-server >= 3.3.3 -Suggests: NetworkManager-team -Provides: cockpit-kdump = %{version}-%{release} -Provides: cockpit-networkmanager = %{version}-%{release} -Provides: cockpit-selinux = %{version}-%{release} -Provides: cockpit-sosreport = %{version}-%{release} +Requires: NetworkManager >= 1.6 +Requires: kexec-tools +Requires: sos +Requires: sudo +Recommends: PackageKit +Recommends: setroubleshoot-server >= 3.3.3 +Suggests: NetworkManager-team +Provides: cockpit-kdump = %{version}-%{release} +Provides: cockpit-networkmanager = %{version}-%{release} +Provides: cockpit-selinux = %{version}-%{release} +Provides: cockpit-sosreport = %{version}-%{release} %endif %if 0%{?fedora} -Recommends: (reportd if abrt) +Recommends: (reportd if abrt) %endif #NPM_PROVIDES @@ -572,25 +583,25 @@ This package contains the Cockpit shell and system configuration interfaces. %dir %{_datadir}/cockpit/shell/images %package ws -Summary: Cockpit Web Service -Requires: glib-networking -Requires: glib2 >= 2.50.0 -Requires: openssl +Summary: Cockpit Web Service +Requires: glib-networking +Requires: openssl +Requires: glib2 >= 2.50.0 %if 0%{?with_selinux} -Requires: (selinux-policy >= %{_selinux_policy_version} if selinux-policy-%{selinuxtype}) +Requires: (selinux-policy >= %{_selinux_policy_version} if selinux-policy-%{selinuxtype}) Requires(post): (policycoreutils if selinux-policy-%{selinuxtype}) %endif -Conflicts: firewalld < 0.6.0-1 -Recommends: sscg >= 2.3 -Recommends: system-logos -Suggests: sssd-dbus +Conflicts: firewalld < 0.6.0-1 +Recommends: sscg >= 2.3 +Recommends: system-logos +Suggests: sssd-dbus %if 0%{?suse_version} -Requires(pre): permissions -Requires: distribution-logos -Requires: wallpaper-branding +Requires(pre): permissions +Requires: distribution-logos +Requires: wallpaper-branding %endif # for cockpit-desktop -Suggests: python3 +Suggests: python3 Provides: group(cockpit-ws) Provides: group(cockpit-wsinstance) Provides: user(cockpit-ws) @@ -744,11 +755,11 @@ done %if 0%{?rhel} == 0 %package kdump -Summary: Cockpit user interface for kernel crash dumping -Requires: cockpit-bridge >= %{required_base} -Requires: cockpit-shell >= %{required_base} -Requires: kexec-tools -BuildArch: noarch +Summary: Cockpit user interface for kernel crash dumping +Requires: cockpit-bridge >= %{required_base} +Requires: cockpit-shell >= %{required_base} +Requires: kexec-tools +BuildArch: noarch %description kdump The Cockpit component for configuring kernel crash dumping. @@ -758,11 +769,11 @@ The Cockpit component for configuring kernel crash dumping. %if !0%{?suse_version} %package sosreport -Summary: Cockpit user interface for diagnostic reports -Requires: cockpit-bridge >= %{required_base} -Requires: cockpit-shell >= %{required_base} -Requires: sos -BuildArch: noarch +Summary: Cockpit user interface for diagnostic reports +Requires: cockpit-bridge >= %{required_base} +Requires: cockpit-shell >= %{required_base} +Requires: sos +BuildArch: noarch %description sosreport The Cockpit component for creating diagnostic reports with the @@ -774,14 +785,14 @@ sosreport tool. %endif %package networkmanager -Summary: Cockpit user interface for networking, using NetworkManager -Requires: NetworkManager >= 1.6 -Requires: cockpit-bridge >= %{required_base} -Requires: cockpit-shell >= %{required_base} -Conflicts: cockpit-wicked +Summary: Cockpit user interface for networking, using NetworkManager +Requires: cockpit-bridge >= %{required_base} +Requires: cockpit-shell >= %{required_base} +Requires: NetworkManager >= 1.6 +Conflicts: cockpit-wicked # Optional components -Recommends: NetworkManager-team -BuildArch: noarch +Recommends: NetworkManager-team +BuildArch: noarch %description networkmanager The Cockpit component for managing networking. This package uses NetworkManager. @@ -794,9 +805,9 @@ The Cockpit component for managing networking. This package uses NetworkManager %if 0%{?rhel} == 0 && ( 0%{?suse_version} >= 1500 || 0%{?is_smo} ) %package selinux -Summary: Cockpit SELinux package -Requires: cockpit-bridge >= %{required_base} -Requires: cockpit-shell >= %{required_base} +Summary: Cockpit SELinux package +Requires: cockpit-bridge >= %{required_base} +Requires: cockpit-shell >= %{required_base} Requires: policycoreutils-python-utils >= 3.1 # setroubleshoot is available on SLE Micro starting with 5.5) %if !0%{?is_smo} || ( 0%{?is_smo} && 0%{?sle_version} >= 150500 ) @@ -829,22 +840,22 @@ Dummy package from building optional packages only; never install or publish me. %if 0%{?build_optional} %package -n cockpit-storaged -Summary: Cockpit user interface for storage, using udisks -Requires: %{__python3} -Requires: cockpit-shell >= %{required_base} -Requires: udisks2 >= 2.9 +Summary: Cockpit user interface for storage, using udisks +Requires: cockpit-shell >= %{required_base} +Requires: udisks2 >= 2.9 +Requires: %{__python3} %if 0%{?suse_version} -Requires: libudisks2-0_lvm2 >= 2.9 -Recommends: multipath-tools -Requires: python3-dbus-python +Requires: libudisks2-0_lvm2 >= 2.9 +Recommends: multipath-tools +Requires: python3-dbus-python %else -Recommends: clevis-luks -Recommends: device-mapper-multipath -Recommends: udisks2-iscsi >= 2.9 -Recommends: udisks2-lvm2 >= 2.9 -Requires: python3-dbus +Recommends: udisks2-lvm2 >= 2.9 +Recommends: udisks2-iscsi >= 2.9 +Recommends: device-mapper-multipath +Recommends: clevis-luks +Requires: python3-dbus %endif -BuildArch: noarch +BuildArch: noarch %description -n cockpit-storaged The Cockpit component for managing storage. This package uses udisks. @@ -854,11 +865,11 @@ The Cockpit component for managing storage. This package uses udisks. %if 0%{?build_tests} %package -n cockpit-tests -Summary: Tests for Cockpit -Requires: cockpit-bridge >= %{required_base} -Requires: cockpit-system >= %{required_base} -Requires: openssh-clients -Provides: cockpit-test-assets = %{version}-%{release} +Summary: Tests for Cockpit +Requires: cockpit-bridge >= %{required_base} +Requires: cockpit-system >= %{required_base} +Requires: openssh-clients +Provides: cockpit-test-assets = %{version}-%{release} %description -n cockpit-tests This package contains tests and files used while testing Cockpit. @@ -873,7 +884,7 @@ These files are not required for running Cockpit. %endif %package devel -Summary: Development files for for Cockpit +Summary: Development files for for Cockpit %description devel This package contains files used to develop cockpit modules @@ -883,9 +894,9 @@ This package contains files used to develop cockpit modules %if %{build_pcp} %package -n cockpit-pcp -Summary: Cockpit PCP integration -Requires: cockpit-bridge >= %{required_base} -Requires: pcp +Summary: Cockpit PCP integration +Requires: cockpit-bridge >= %{required_base} +Requires: pcp %description -n cockpit-pcp Cockpit support for reading PCP metrics and loading PCP archives. @@ -900,13 +911,13 @@ systemctl reload-or-try-restart pmlogger %endif %package -n cockpit-packagekit -Summary: Cockpit user interface for packages -BuildArch: noarch -Requires: PackageKit -Requires: cockpit-bridge >= %{required_base} -Recommends: python3-tracer +Summary: Cockpit user interface for packages +BuildArch: noarch +Requires: cockpit-bridge >= %{required_base} +Requires: PackageKit +Recommends: python3-tracer # HACK: https://bugzilla.redhat.com/show_bug.cgi?id=1800468 -Requires: polkit +Requires: polkit %description -n cockpit-packagekit The Cockpit components for installing OS updates and Cockpit add-ons, @@ -917,4 +928,5 @@ via PackageKit. #/ build optional extension packages %endif +# The changelog is automatically generated and merged %changelog