Accepting request 812928 from home:lnussel:branches:systemsmanagement:cockpit

- new version 220:
  https://cockpit-project.org/blog/cockpit-220.html

OBS-URL: https://build.opensuse.org/request/show/812928
OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:cockpit/cockpit?expand=0&rev=34

cockpit.spec

@@ -76,7 +76,7 @@ Summary:        Web Console for Linux servers
 License:        LGPL-2.1-or-later
 URL:            https://cockpit-project.org/
 
-Version:        215
+Version:        220
 %if %{defined wip}
 Release:        1.%{wip}%{?dist}
 Source0:        cockpit-%{version}.tar.xz
@@ -86,11 +86,6 @@ Source0:        https://github.com/cockpit-project/cockpit/releases/download/%{v
 %endif
 Source1:       cockpit.pam
 Source2:       cockpit-rpmlintrc
-# merged upstream after 215
-Patch:         0001-test-handle-XDG_CONFIG_DIRS.patch
-Patch1:        0001-openSUSE-Tumbleweed-branding.patch
-# backport from upstream
-Patch2:        0001-bridge-Pass-connectable-to-TLS-client-connection.patch
 
 BuildRequires: gcc
 BuildRequires: pkgconfig(gio-unix-2.0)
@@ -102,7 +97,7 @@ BuildRequires: autoconf automake
 BuildRequires: /usr/bin/python3
 BuildRequires: gettext >= 0.19.7
 %if %{defined build_dashboard}
-BuildRequires: libssh-devel >= 0.8
+BuildRequires: libssh-devel >= 0.8.5
 %endif
 BuildRequires: openssl-devel
 BuildRequires: gnutls-devel >= 3.4.3
@@ -155,7 +150,6 @@ Recommends: (cockpit-docker if /usr/bin/docker)
 %endif
 
 %if 0%{?rhel} == 0
-Recommends: cockpit-dashboard
 Recommends: (cockpit-networkmanager if NetworkManager)
 Suggests: cockpit-selinux
 %endif
@@ -186,7 +180,13 @@ make -j4 %{?extra_flags} all
 
 %check
 exec 2>&1
-make -j4 check
+# HACK: Fedora koji builders are very slow, unreliable, and inaccessible for debugging; https://github.com/cockpit-project/cockpit/issues/13909
+%if 0%{?fedora} >= 0
+%ifarch s390x
+%define testsuite_fail || true
+%endif
+%endif
+make -j4 check %{?testsuite_fail}
 
 %install
 make install DESTDIR=%{buildroot}
@@ -294,7 +294,7 @@ for pkg in apps dashboard docker machines packagekit pcp playground storaged; do
     rm -rf %{buildroot}/%{_datadir}/cockpit/$pkg
 done
 # files from -tests
-rm -r %{buildroot}/%{_prefix}/%{__lib}/cockpit-test-assets %{buildroot}/%{_sysconfdir}/cockpit/cockpit.conf
+rm -r %{buildroot}/%{_prefix}/%{__lib}/cockpit-test-assets
 # files from -pcp
 rm -r %{buildroot}/%{_libexecdir}/cockpit-pcp %{buildroot}/%{_localstatedir}/lib/pcp/
 # files from -machines
@@ -435,6 +435,7 @@ Recommends: NetworkManager-team
 Recommends: setroubleshoot-server >= 3.3.3
 Provides: cockpit-selinux = %{version}-%{release}
 Provides: cockpit-sosreport = %{version}-%{release}
+Requires: sos
 %endif
 %if 0%{?fedora} >= 29
 # 0.7.0 (actually) supports task cancellation.
@@ -442,8 +443,8 @@ Provides: cockpit-sosreport = %{version}-%{release}
 Recommends: (reportd >= 0.7.1 if abrt)
 %endif
 # NPM modules which are also available as packages
-Provides: bundled(js-jquery) = 3.4.1
-Provides: bundled(js-moment) = 2.24.0
+Provides: bundled(js-jquery) = 3.5.1
+Provides: bundled(js-moment) = 2.25.3
 Provides: bundled(nodejs-flot) = 0.8.3
 Provides: bundled(xstatic-bootstrap-datepicker-common) = 1.9.0
 Provides: bundled(xstatic-patternfly-common) = 3.59.4
@@ -648,11 +649,7 @@ The Cockpit component for managing storage.  This package uses udisks.
 Summary: Tests for Cockpit
 Requires: cockpit-bridge >= 138
 Requires: cockpit-system >= 138
-%if 0%{?suse_version}
-Requires: openssh
-%else
-Requires: openssh-clients
-%endif
+Requires: /usr/bin/ssh-agent /usr/bin/ssh-add
 Provides: cockpit-test-assets = %{version}-%{release}
 
 %description -n cockpit-tests
@@ -660,7 +657,6 @@ This package contains tests and files used while testing Cockpit.
 These files are not required for running Cockpit.
 
 %files -n cockpit-tests -f tests.list
-%config(noreplace) %{_sysconfdir}/cockpit/cockpit.conf
 %{_prefix}/%{__lib}/cockpit-test-assets
 
 %if !0%{?suse_version}
@@ -710,14 +706,13 @@ Cockpit support for reading PCP metrics and loading PCP archives.
 
 %if %{defined build_dashboard}
 %package -n cockpit-dashboard
-Summary: Cockpit remote servers and dashboard
+Summary: Cockpit remote server dashboard
 BuildArch: noarch
 Requires: cockpit-ssh >= 135
 Conflicts: cockpit-ws < 135
 
 %description -n cockpit-dashboard
-Cockpit support for connecting to remote servers (through ssh),
-bastion hosts, and a basic dashboard.
+Cockpit page for showing performance graphs for up to 20 remote servers.
 
 %files -n cockpit-dashboard -f dashboard.list