From 1d20b4fe9c7e982e1fe231e67b4b90683c13a7ed9eb9256eef4e995e820a746d Mon Sep 17 00:00:00 2001 From: Luna Date: Tue, 13 Aug 2024 16:30:11 +0530 Subject: [PATCH] update spec file to latest from github and update suse_docs.patch to point to live urls --- cockpit.spec | 7 +++++-- suse_docs.patch | 22 +++++++++++----------- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/cockpit.spec b/cockpit.spec index 7864e78..0250b2c 100644 --- a/cockpit.spec +++ b/cockpit.spec @@ -1,4 +1,3 @@ -# # Copyright (C) 2014-2020 Red Hat, Inc. # # Cockpit is free software; you can redistribute it and/or modify it @@ -52,7 +51,7 @@ URL: https://cockpit-project.org/ Version: 322 Release: 0 -Source0: cockpit-%{version}.tar +Source0: cockpit-%{version}.tar.gz Source1: cockpit.pam Source2: cockpit-rpmlintrc Source3: cockpit-suse-theme.tar @@ -262,6 +261,9 @@ autoreconf -fvi -I tools %if %{build_pcp} == 0 --disable-pcp \ %endif +%if %{enable_multihost} + --enable-multihost \ +%endif %if 0%{?with_selinux} make -f /usr/share/selinux/devel/Makefile cockpit.pp @@ -566,6 +568,7 @@ Suggests: sssd-dbus >= 2.6.2 %if 0%{?suse_version} Requires(pre): permissions Requires: distribution-logos +Requires: pam_oath Requires: wallpaper-branding %endif # for cockpit-desktop diff --git a/suse_docs.patch b/suse_docs.patch index e326012..2287224 100644 --- a/suse_docs.patch +++ b/suse_docs.patch @@ -38,22 +38,22 @@ index c7b2cc6a0..f37aa1565 100644 - { - "label": "Managing networking teams", - "url": "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/9/html/managing_systems_using_the_rhel_9_web_console/configuring-network-teams-using-the-web-console_system-management-using-the-rhel-9-web-console" -+ "url": "https://documentation.suse.com/smart/systems-management/html/cockpit-slemicro/index.html#cockpit-managing-bonds" ++ "url": "https://documentation.suse.com/sle-micro/6.0/html/Micro-6.0-cockpit/index.html#cockpit-managing-bonds" }, { "label": "Managing networking bridges", - "url": "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/9/html/managing_systems_using_the_rhel_9_web_console/configuring-network-bridges-in-the-web-console_system-management-using-the-rhel-9-web-console" -+ "url": "https://documentation.suse.com/smart/systems-management/html/cockpit-slemicro/index.html#task-managing-bridges" ++ "url": "https://documentation.suse.com/sle-micro/6.0/html/Micro-6.0-cockpit/index.html#task-managing-bridges" }, { "label": "Managing VLANs", - "url": "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/9/html/managing_systems_using_the_rhel_9_web_console/configuring-vlans-in-the-web-console_system-management-using-the-rhel-9-web-console" -+ "url": "https://documentation.suse.com/smart/systems-management/html/cockpit-slemicro/index.html#task-managing-vlans" ++ "url": "https://documentation.suse.com/sle-micro/6.0/html/Micro-6.0-cockpit/index.html#task-managing-vlans" }, { "label": "Managing firewall", - "url": "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/9/html/managing_systems_using_the_rhel_9_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" ++ "url": "https://documentation.suse.com/sle-micro/6.0/html/Micro-6.0-cockpit/index.html#task-managing-firewall-cockpit" } ], "keywords": [ @@ -79,23 +79,23 @@ index 8ee17324b..319204a22 100644 { "label": "Managing partitions", - "url": "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/9/html/managing_systems_using_the_rhel_9_web_console/managing-partitions-using-the-web-console_system-management-using-the-rhel-9-web-console" -+ "url": "https://documentation.suse.com/smart/systems-management/html/cockpit-slemicro/index.html#glue-cockpit-managing-filesystems" ++ "url": "https://documentation.suse.com/sle-micro/6.0/html/Micro-6.0-cockpit/index.html#glue-cockpit-managing-filesystems" }, { "label": "Managing NFS mounts", - "url": "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/9/html/managing_systems_using_the_rhel_9_web_console/managing-nfs-mounts-in-the-web-console_system-management-using-the-rhel-9-web-console" -+ "url": "https://documentation.suse.com/smart/systems-management/html/cockpit-slemicro/index.html#task-managing-NFS-mounts" ++ "url": "https://documentation.suse.com/sle-micro/6.0/html/Micro-6.0-cockpit/index.html#task-managing-NFS-mounts" }, { "label": "Managing RAIDs", - "url": "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/9/html/managing_systems_using_the_rhel_9_web_console/managing-redundant-arrays-of-independent-disks-in-the-web-console_system-management-using-the-rhel-9-web-console" -+ "url": "https://documentation.suse.com/smart/systems-management/html/cockpit-slemicro/index.html#id-1.7.6" ++ "url": "https://documentation.suse.com/sle-micro/6.0/html/Micro-6.0-cockpit/index.html#id-1.7.6" }, { "label": "Managing LVMs", - "url": "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/9/html/managing_systems_using_the_rhel_9_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" ++ "url": "https://documentation.suse.com/sle-micro/6.0/html/Micro-6.0-cockpit/index.html#id-1.7.7" + } + ], + "docs-rh": [ @@ -111,7 +111,7 @@ index bd62a4cb3..5daf0a499 100644 { "label": "Configuring system settings", - "url": "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/9/html/managing_systems_using_the_rhel_9_web_console/getting-started-with-the-rhel-9-web-console_system-management-using-the-rhel-9-web-console" -+ "url": "https://documentation.suse.com/smart/systems-management/html/cockpit-slemicro/index.html#cockpit-configuring-servers" ++ "url": "https://documentation.suse.com/sle-micro/6.0/html/Micro-6.0-cockpit/index.html#cockpit-configuring-servers" } ], "keywords": [ @@ -120,7 +120,7 @@ index bd62a4cb3..5daf0a499 100644 { "label": "Managing services", - "url": "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/9/html/managing_systems_using_the_rhel_9_web_console/managing-services-in-the-web-console_system-management-using-the-rhel-9-web-console" -+ "url": "https://documentation.suse.com/smart/systems-management/html/cockpit-slemicro/index.html#glue-services-management" ++ "url": "https://documentation.suse.com/sle-micro/6.0/html/Micro-6.0-cockpit/index.html#glue-services-management" } ], "keywords": [ @@ -129,7 +129,7 @@ index bd62a4cb3..5daf0a499 100644 { "label": "Reviewing logs", - "url": "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/9/html/managing_systems_using_the_rhel_9_web_console/reviewing-logs_system-management-using-the-rhel-9-web-console" -+ "url": "https://documentation.suse.com/smart/systems-management/html/cockpit-slemicro/index.html#cockpit-filtering-logs" ++ "url": "https://documentation.suse.com/sle-micro/6.0/html/Micro-6.0-cockpit/index.html#cockpit-filtering-logs" } ], "keywords": [