diff --git a/.cockpit.metadata b/.cockpit.metadata
index 907fc6a..99701ab 100644
--- a/.cockpit.metadata
+++ b/.cockpit.metadata
@@ -1 +1 @@
-b58f59c33ec5168148d725bb80b66cbdb7cb5496 SOURCES/cockpit-237.tar.xz
+f172885405c1c6f3fdc0da4e5a2ee7fb80b7cd3e SOURCES/cockpit-238.tar.xz
diff --git a/.gitignore b/.gitignore
index ba8ad88..d2420d1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/cockpit-237.tar.xz
+SOURCES/cockpit-238.tar.xz
diff --git a/SPECS/cockpit.spec b/SPECS/cockpit.spec
index d32cd3d..b6c5209 100644
--- a/SPECS/cockpit.spec
+++ b/SPECS/cockpit.spec
@@ -1,5 +1,5 @@
# This spec file has been automatically updated
-Version: 237
+Version: 238
Release: 1%{?dist}
#
# Copyright (C) 2014-2020 Red Hat, Inc.
@@ -61,7 +61,7 @@ License: LGPLv2+
URL: https://cockpit-project.org/
%if %{defined wip}
-Source0: cockpit-%{version}.tar.gz
+Source0: cockpit-%{version}.tar.xz
%else
Source0: https://github.com/cockpit-project/cockpit/releases/download/%{version}/cockpit-%{version}.tar.xz
%endif
@@ -262,7 +262,6 @@ find %{buildroot}%{_datadir}/cockpit/static -type f >> static.list
%if 0%{?build_basic} == 0
for pkg in base1 branding motd kdump networkmanager selinux shell sosreport ssh static systemd tuned users metrics; do
rm -r %{buildroot}/%{_datadir}/cockpit/$pkg
- rm -rf %{buildroot}/usr/src/debug/%{_datadir}/cockpit/$pkg
rm -f %{buildroot}/%{_datadir}/metainfo/org.cockpit-project.cockpit-${pkg}.metainfo.xml
done
for data in doc locale man pixmaps polkit-1; do
@@ -283,7 +282,7 @@ rm -f %{buildroot}%{_datadir}/metainfo/cockpit.appdata.xml
# when not building optional packages, remove their files
%if 0%{?build_optional} == 0
for pkg in apps machines packagekit pcp playground storaged; do
- rm -rf %{buildroot}/%{_datadir}/cockpit/$pkg %{buildroot}/usr/src/debug/%{_datadir}/cockpit/$pkg
+ rm -rf %{buildroot}/%{_datadir}/cockpit/$pkg
done
# files from -tests
rm -r %{buildroot}/%{_prefix}/%{__lib}/cockpit-test-assets
@@ -311,18 +310,6 @@ install -m 644 -D /dev/null %{buildroot}/run/cockpit/motd
%define find_debug_info %{_rpmconfigdir}/find-debuginfo.sh %{?_missing_build_ids_terminate_build:--strict-build-id} %{?_include_minidebuginfo:-m} %{?_find_debuginfo_dwz_opts} %{?_find_debuginfo_opts} %{?_debugsource_packages:-S debugsourcefiles.list} "%{_builddir}/%{?buildsubdir}"
-# Redefine how debug info is built to slip in our extra debug files
-%define __debug_install_post \
- %{find_debug_info} \
- cat debug.partial >> %{_builddir}/%{?buildsubdir}/debugfiles.list \
-%{nil}
-
-# Build the package lists for debug package, and move debug files to installed locations
-find %{buildroot}/usr/src/debug%{_datadir}/cockpit -type f -o -type l > debug.partial
-sed -i "s|%{buildroot}/usr/src/debug||" debug.partial
-sed -n 's/\.map\(\.gz\)\?$/\0/p' *.list >> debug.partial
-sed -i '/\.map\(\.gz\)\?$/d' *.list
-tar -C %{buildroot}/usr/src/debug -cf - . | tar -C %{buildroot} -xf -
%endif
# /suse_version
rm -rf %{buildroot}/usr/src/debug
@@ -686,6 +673,7 @@ Summary: Cockpit user interface for packages
BuildArch: noarch
Requires: cockpit-bridge >= 186
Requires: PackageKit
+Recommends: python3-tracer
%description -n cockpit-packagekit
The Cockpit components for installing OS updates and Cockpit add-ons,
@@ -698,6 +686,10 @@ via PackageKit.
# The changelog is automatically generated and merged
%changelog
+* Wed Feb 17 2021 Martin Pitt <mpitt@redhat.com> - 238-1
+- Web server: Preserve permissions of administrator-provided certificates
+- System: Performance page shows busiest CPU cores
+
* Fri Feb 05 2021 Martin Pitt <mpitt@redhat.com> - 237-1
- SSH connections to remote machines are only opened when necessary