diff --git a/.cockpit-appstream.metadata b/.cockpit-appstream.metadata index 04897ea..1433c2c 100644 --- a/.cockpit-appstream.metadata +++ b/.cockpit-appstream.metadata @@ -1 +1 @@ -4455adcaaa7d0a6845e37e72df38b48e0f6074c1 SOURCES/cockpit-234.tar.xz +5b9a204e2724b7a5243e2b9197c275aa47492af8 SOURCES/cockpit-235.tar.xz diff --git a/.gitignore b/.gitignore index 8406f15..1843b35 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/cockpit-234.tar.xz +SOURCES/cockpit-235.tar.xz diff --git a/SPECS/cockpit-appstream.spec b/SPECS/cockpit-appstream.spec index 367f1e9..cec8e0f 100644 --- a/SPECS/cockpit-appstream.spec +++ b/SPECS/cockpit-appstream.spec @@ -1,5 +1,5 @@ # This spec file has been automatically updated -Version: 234 +Version: 235 Release: 1%{?dist} # # Copyright (C) 2014-2020 Red Hat, Inc. @@ -254,6 +254,9 @@ find %{buildroot}%{_datadir}/cockpit/selinux -type f >> selinux.list echo '%dir %{_datadir}/cockpit/playground' > tests.list find %{buildroot}%{_datadir}/cockpit/playground -type f >> tests.list +echo '%dir %{_datadir}/cockpit/static' > static.list +find %{buildroot}%{_datadir}/cockpit/static -type f >> static.list + # when not building basic packages, remove their files %if 0%{?build_basic} == 0 for pkg in base1 branding motd kdump networkmanager selinux shell sosreport ssh static systemd tuned users metrics; do @@ -416,7 +419,7 @@ Obsoletes: cockpit-networkmanager Requires: NetworkManager >= 1.6 Provides: cockpit-kdump = %{version}-%{release} Requires: kexec-tools -Recommends: polkit +Recommends: (sudo or polkit) Recommends: PackageKit Recommends: NetworkManager-team Recommends: setroubleshoot-server >= 3.3.3 @@ -459,7 +462,7 @@ The Cockpit Web Service listens on the network, and authenticates users. If sssd-dbus is installed, you can enable client certificate/smart card authentication via sssd/FreeIPA. -%files ws -f cockpit.lang +%files ws -f cockpit.lang -f static.list %doc %{_mandir}/man1/cockpit-desktop.1.gz %doc %{_mandir}/man5/cockpit.conf.5.gz %doc %{_mandir}/man8/cockpit-ws.8.gz @@ -498,7 +501,6 @@ authentication via sssd/FreeIPA. %{_libexecdir}/cockpit-tls %{_libexecdir}/cockpit-desktop %attr(4750, root, cockpit-wsinstance) %{_libexecdir}/cockpit-session -%{_datadir}/cockpit/static %{_datadir}/cockpit/branding %pre ws @@ -696,6 +698,10 @@ via PackageKit. # The changelog is automatically generated and merged %changelog +* Fri Jan 08 2021 Matej Marusak - 235-1 +- machines: Fix check of cpu configuration between active/inactive XML (rhbz#1913205) +- machines: Fix rounding of memory when switching from MB to GB (rhbz#1908683) + * Mon Dec 14 2020 Katerina Koukiou - 234-1 - machines: Allow editing VM's CPU mode and model (rhbz#1683301) - machines: Add support for cloning VMs (rhbz#1683391)