From e38f60e973bf51544e630db50b22d86c1a2d790a Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Fri, 27 Jan 2023 02:10:48 +0000
Subject: [PATCH] Auto sync2gitlab import of cockpit-284-1.el8.src.rpm

---
 .gitignore   |  1 +
 cockpit.spec | 12 +++++++-----
 sources      |  2 +-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index d4da09a..e632b68 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@
 /cockpit-279.tar.xz
 /cockpit-282.1.tar.xz
 /cockpit-283.tar.xz
+/cockpit-284.tar.xz
diff --git a/cockpit.spec b/cockpit.spec
index ec05954..59a1c09 100644
--- a/cockpit.spec
+++ b/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
 
diff --git a/sources b/sources
index 7c6c18e..e2ffb95 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (cockpit-283.tar.xz) = 05da4974d6e7faa226f099804237f81e93d794929c0cbd3700c721d1e489e646698ad2002d1ce894b145fd3c9d268e5f8e9a536b4029cf6dc025d47df89fd0e7
+SHA512 (cockpit-284.tar.xz) = 3aedd62138e9d80da49e7ef2bb199cf71fc677d41f3f58810c1549e4921647d5eeaa4b24361a5b6f06f35ae9e86010f27651b9398d4a2d460b22e0b516c00365
 SHA512 (cockpit.css.gz) = 1851e890e49141c17e498f1472c3bc307439cefaa0f1dccecbfc87b04087af03ca42199c86116c1fcf8890b58ca98f8aecfb01cc8b3c03a76e2685f7bd610568