From 5d34d0348d2e3ff17ee251e848573164a92a2390 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Jan 27 2023 02:10:35 +0000
Subject: import cockpit-284-1.el8


---

diff --git a/.cockpit.metadata b/.cockpit.metadata
index 41db4d9..703223d 100644
--- a/.cockpit.metadata
+++ b/.cockpit.metadata
@@ -1,2 +1,2 @@
-0cf4b6630c50c629f93cac26c1c2a57c42e0d1ae SOURCES/cockpit-283.tar.xz
+b5b4613f2d157387f456943fbcb43425b1a40f52 SOURCES/cockpit-284.tar.xz
 a37e1d6ad4b1b25729682c54ab7e4dcdcfd894a7 SOURCES/cockpit.css.gz
diff --git a/.gitignore b/.gitignore
index 9c53337..c427b7f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-SOURCES/cockpit-283.tar.xz
+SOURCES/cockpit-284.tar.xz
 SOURCES/cockpit.css.gz
diff --git a/SPECS/cockpit.spec b/SPECS/cockpit.spec
index ec05954..59a1c09 100644
--- a/SPECS/cockpit.spec
+++ b/SPECS/cockpit.spec
@@ -49,7 +49,7 @@ Summary:        Web Console for Linux servers
 License:        LGPL-2.1-or-later
 URL:            https://cockpit-project.org/
 
-Version:        283
+Version:        284
 Release:        1%{?dist}
 Source0:        https://github.com/cockpit-project/cockpit/releases/download/%{version}/cockpit-%{version}.tar.xz
 Source1:        cockpit.css.gz
@@ -334,8 +334,6 @@ troubleshooting, interactive command-line sessions, and more.
 Summary: Cockpit bridge server-side component
 Requires: glib-networking
 Provides: cockpit-ssh = %{version}-%{release}
-# PR #10430 dropped workaround for ws' inability to understand x-host-key challenge
-Conflicts: cockpit-ws < 181.x
 # 233 dropped jquery.js, pages started to bundle it (commit 049e8b8dce)
 Conflicts: cockpit-dashboard < 233
 Conflicts: cockpit-networkmanager < 233
@@ -632,8 +630,8 @@ The Cockpit component for managing storage.  This package uses udisks.
 
 %package -n cockpit-tests
 Summary: Tests for Cockpit
-Requires: cockpit-bridge >= 138
-Requires: cockpit-system >= 138
+Requires: cockpit-bridge >= %{required_base}
+Requires: cockpit-system >= %{required_base}
 Requires: openssh-clients
 Provides: cockpit-test-assets = %{version}-%{release}
 
@@ -681,6 +679,10 @@ via PackageKit.
 
 # The changelog is automatically generated and merged
 %changelog
+* Wed Jan 25 2023 Martin Pitt <mpitt@redhat.com> - 284-1
+- Services: Show logs for user units
+- Storage: Set up a system to use NBDE
+
 * Wed Jan 11 2023 Katerina Koukiou <kkoukiou@redhat.com> - 283-1
 - Services: Create timer to run every minute