diff --git a/.gitignore b/.gitignore index 152501d..a925869 100644 --- a/.gitignore +++ b/.gitignore @@ -215,3 +215,4 @@ /cockpit-250.tar.xz /cockpit-251.tar.xz /cockpit-252.tar.xz +/cockpit-253.tar.xz diff --git a/cockpit.spec b/cockpit.spec index caa77ce..27d5ccc 100644 --- a/cockpit.spec +++ b/cockpit.spec @@ -1,5 +1,5 @@ # This spec file has been automatically updated -Version: 252 +Version: 253 Release: 1%{?dist} # # Copyright (C) 2014-2020 Red Hat, Inc. @@ -215,7 +215,7 @@ install -D -p -m 644 AUTHORS COPYING README.md %{buildroot}%{_docdir}/cockpit/ %endif # only ship deprecated PatternFly API for stable releases -%if 0%{?fedora} <= 33 || 0%{?rhel} <= 8 +%if 0%{?rhel} <= 8 ln -s cockpit.css.gz %{buildroot}/%{_datadir}/cockpit/base1/patternfly.css.gz %endif @@ -428,14 +428,11 @@ Provides: cockpit-selinux = %{version}-%{release} Provides: cockpit-sosreport = %{version}-%{release} Requires: sos %endif -%if 0%{?fedora} >= 29 -# 0.7.0 (actually) supports task cancellation. -# 0.7.1 fixes tasks never announcing completion. -Recommends: (reportd >= 0.7.1 if abrt) +%if 0%{?fedora} +Recommends: (reportd if abrt) %endif # NPM modules which are also available as packages Provides: bundled(js-jquery) = 3.5.1 -Provides: bundled(xstatic-bootstrap-datepicker-common) = 1.9.0 Provides: bundled(xstatic-patternfly-common) = 3.59.5 %description system @@ -716,6 +713,9 @@ via PackageKit. # The changelog is automatically generated and merged %changelog +* Wed Sep 15 2021 Katerina Koukiou - 253-1 +- SELinux: Dismiss multiple alerts + * Wed Sep 01 2021 Simon Kobyda - 252-1 - Webserver: Drop remotectl utility - Shell: Show package version in ‘About web console’ modal diff --git a/plans/upstream.fmf b/plans/upstream.fmf index 3c2c08c..e2374a2 100644 --- a/plans/upstream.fmf +++ b/plans/upstream.fmf @@ -2,6 +2,6 @@ discover: how: fmf repository: https://github.com/cockpit-project/cockpit # FIXME: get rid of the hardcoding: https://github.com/psss/tmt/issues/585 - ref: "252" + ref: "253" execute: how: tmt diff --git a/sources b/sources index a0b8c8b..892488c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cockpit-252.tar.xz) = 38e5cc4b991264599e3178d99202a937fd56cfe7d8e6f02ef47c9eca2e82e88eb9dd4db08195e83cb82e862134e16b857d21322361b5f506dd31221bcb5a0b22 +SHA512 (cockpit-253.tar.xz) = d2d6677d2a780f428c5db7f636344acbb685c4ee94fe53bc84604551b8d367134cf7363f5866edc6efbee7d293303fb89754f2e5175c3f439b24ba0f0567d9a3