From b6c3a89d45703fa5d8cc8fbb9ecadea7fe4a9b23 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Feb 12 2021 08:13:46 +0000
Subject: import cockpit-237-1.el8


---

diff --git a/.cockpit.metadata b/.cockpit.metadata
index 6a0035b..907fc6a 100644
--- a/.cockpit.metadata
+++ b/.cockpit.metadata
@@ -1 +1 @@
-9d3cc89161766659d465d8c5c9ab03255889b0cf SOURCES/cockpit-236.tar.xz
+b58f59c33ec5168148d725bb80b66cbdb7cb5496 SOURCES/cockpit-237.tar.xz
diff --git a/.gitignore b/.gitignore
index 318654b..ba8ad88 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/cockpit-236.tar.xz
+SOURCES/cockpit-237.tar.xz
diff --git a/SPECS/cockpit.spec b/SPECS/cockpit.spec
index 937f346..d32cd3d 100644
--- a/SPECS/cockpit.spec
+++ b/SPECS/cockpit.spec
@@ -1,5 +1,5 @@
 # This spec file has been automatically updated
-Version:        236
+Version:        237
 Release: 1%{?dist}
 #
 # Copyright (C) 2014-2020 Red Hat, Inc.
@@ -66,10 +66,11 @@ Source0:        cockpit-%{version}.tar.gz
 Source0:        https://github.com/cockpit-project/cockpit/releases/download/%{version}/cockpit-%{version}.tar.xz
 %endif
 
-# in RHEL the source package is duplicated: cockpit (building basic packages like cockpit-{bridge,system})
+# in RHEL 8 the source package is duplicated: cockpit (building basic packages like cockpit-{bridge,system})
 # and cockpit-appstream (building optional packages like cockpit-{machines,pcp})
 # This split does not apply to EPEL/COPR.
-%if 0%{?rhel} && 0%{?epel} == 0
+# In Fedora ELN/RHEL 9+ there is just one source package, which ships rpms in both BaseOS and AppStream
+%if 0%{?rhel} == 8 && 0%{?epel} == 0
 
 %if "%{name}" == "cockpit"
 %define build_basic 1
@@ -413,6 +414,7 @@ Provides: cockpit-shell = %{version}-%{release}
 Provides: cockpit-systemd = %{version}-%{release}
 Provides: cockpit-tuned = %{version}-%{release}
 Provides: cockpit-users = %{version}-%{release}
+Obsoletes: cockpit-dashboard
 %if 0%{?rhel}
 Provides: cockpit-networkmanager = %{version}-%{release}
 Obsoletes: cockpit-networkmanager
@@ -426,7 +428,6 @@ Recommends: setroubleshoot-server >= 3.3.3
 Provides: cockpit-selinux = %{version}-%{release}
 Provides: cockpit-sosreport = %{version}-%{release}
 Requires: sos
-Obsoletes: cockpit-dashboard
 %endif
 %if 0%{?fedora} >= 29
 # 0.7.0 (actually) supports task cancellation.
@@ -697,6 +698,9 @@ via PackageKit.
 
 # The changelog is automatically generated and merged
 %changelog
+* Fri Feb 05 2021 Martin Pitt <mpitt@redhat.com> - 237-1
+- SSH connections to remote machines are only opened when necessary
+
 * Fri Jan 22 2021 Matej Marusak <mmarusak@redhat.com> - 236-1
 - fslist channels: Include properties of changed files
 - Internal stabilization work