From c3c4cf7dbdcb240c18081e4747d54fafff4e4fafee6aeb7a392ef87891075d8b Mon Sep 17 00:00:00 2001 From: Luna Date: Fri, 16 Aug 2024 11:13:14 +0530 Subject: [PATCH] update spec file to latest from github and update suse_docs.patch to point to live urls --- cockpit.spec | 5 +++++ suse_docs.patch | 40 ++++++++++++++++++++++------------------ 2 files changed, 27 insertions(+), 18 deletions(-) diff --git a/cockpit.spec b/cockpit.spec index 0250b2c..72ee320 100644 --- a/cockpit.spec +++ b/cockpit.spec @@ -112,6 +112,11 @@ ExcludeArch: %{ix86} %endif %endif +%define enable_multihost 1 +%if 0%{?fedora} >= 41 || 0%{?rhel} >= 10 +%define enable_multihost 0 +%endif + %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1500 # Ship custom SELinux policy %define selinuxtype targeted diff --git a/suse_docs.patch b/suse_docs.patch index 2287224..5c1749b 100644 --- a/suse_docs.patch +++ b/suse_docs.patch @@ -1,6 +1,6 @@ -From f073cda8e0278b2c89d747d5990af5b46eea0472 Mon Sep 17 00:00:00 2001 +From a051a54e7a522e1a6f20a56d3cae5f3eacdeeff9 Mon Sep 17 00:00:00 2001 From: Luna -Date: Tue, 13 Aug 2024 11:36:40 +0530 +Date: Fri, 16 Aug 2024 11:10:19 +0530 Subject: [PATCH] replace with suse docs and move docs with out eqiv to docs-rh --- @@ -9,8 +9,8 @@ Subject: [PATCH] replace with suse docs and move docs with out eqiv to docs-rh pkg/shell/manifest.json | 2 +- pkg/storaged/manifest.json | 12 +++++++----- pkg/systemd/manifest.json | 6 +++--- - pkg/users/manifest.json | 2 +- - 6 files changed, 17 insertions(+), 19 deletions(-) + pkg/users/manifest.json | 4 ++-- + 6 files changed, 18 insertions(+), 20 deletions(-) diff --git a/pkg/kdump/manifest.json b/pkg/kdump/manifest.json index 65a03d10f..ac0ee34b9 100644 @@ -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/sle-micro/6.0/html/Micro-6.0-cockpit/index.html#cockpit-managing-bonds" ++ "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/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/sle-micro/6.0/html/Micro-6.0-cockpit/index.html#task-managing-bridges" ++ "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/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/sle-micro/6.0/html/Micro-6.0-cockpit/index.html#task-managing-vlans" ++ "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/9/html/managing_systems_using_the_rhel_9_web_console/managing_firewall_using_the_web_console" -+ "url": "https://documentation.suse.com/sle-micro/6.0/html/Micro-6.0-cockpit/index.html#task-managing-firewall-cockpit" ++ "url": "https://documentation.suse.com/smart/systems-management/html/cockpit-slemicro/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/sle-micro/6.0/html/Micro-6.0-cockpit/index.html#glue-cockpit-managing-filesystems" ++ "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/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/sle-micro/6.0/html/Micro-6.0-cockpit/index.html#task-managing-NFS-mounts" ++ "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/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/sle-micro/6.0/html/Micro-6.0-cockpit/index.html#id-1.7.6" ++ "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/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/sle-micro/6.0/html/Micro-6.0-cockpit/index.html#id-1.7.7" ++ "url": "https://documentation.suse.com/smart/systems-management/html/cockpit-slemicro/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/sle-micro/6.0/html/Micro-6.0-cockpit/index.html#cockpit-configuring-servers" ++ "url": "https://documentation.suse.com/smart/systems-management/html/cockpit-slemicro/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/sle-micro/6.0/html/Micro-6.0-cockpit/index.html#glue-services-management" ++ "url": "https://documentation.suse.com/smart/systems-management/html/cockpit-slemicro/index.html#glue-services-management" } ], "keywords": [ @@ -129,15 +129,15 @@ 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/sle-micro/6.0/html/Micro-6.0-cockpit/index.html#cockpit-filtering-logs" ++ "url": "https://documentation.suse.com/smart/systems-management/html/cockpit-slemicro/index.html#cockpit-filtering-logs" } ], "keywords": [ diff --git a/pkg/users/manifest.json b/pkg/users/manifest.json -index 04295b6a4..22eca3c6b 100644 +index 04295b6a4..2609d0b2c 100644 --- a/pkg/users/manifest.json +++ b/pkg/users/manifest.json -@@ -3,7 +3,7 @@ +@@ -3,10 +3,10 @@ "index": { "label": "Accounts", "order": 70, @@ -145,7 +145,11 @@ index 04295b6a4..22eca3c6b 100644 + "docs-rh": [ { "label": "Managing user accounts", - "url": "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/9/html/managing_systems_using_the_rhel_9_web_console/managing-user-accounts-in-the-web-console_system-management-using-the-rhel-9-web-console" +- "url": "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/9/html/managing_systems_using_the_rhel_9_web_console/managing-user-accounts-in-the-web-console_system-management-using-the-rhel-9-web-console" ++ "url": "https://documentation.suse.com/sle-micro/6.0/html/Micro-6.0-cockpit/index.html#glue-managing-users" + } + ], + "keywords": [ -- 2.46.0