From 3baf25c18795f6d0a7724dac77b31eab2b2f1fce Mon Sep 17 00:00:00 2001 From: Cockpit Project Date: Thu, 28 Apr 2022 07:18:05 +0000 Subject: [PATCH] Update to 268-1 - Update to upstream 268 release --- .gitignore | 1 + cockpit.spec | 16 +++++++++++++--- plans/upstream.fmf | 2 +- sources | 2 +- 4 files changed, 16 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 55facbf..8ae42f4 100644 --- a/.gitignore +++ b/.gitignore @@ -231,3 +231,4 @@ /cockpit-265.tar.xz /cockpit-266.tar.xz /cockpit-267.tar.xz +/cockpit-268.tar.xz diff --git a/cockpit.spec b/cockpit.spec index c797cf9..0636a9a 100644 --- a/cockpit.spec +++ b/cockpit.spec @@ -1,5 +1,5 @@ # This spec file has been automatically updated -Version: 267 +Version: 268 Release: 1%{?dist} # # Copyright (C) 2014-2020 Red Hat, Inc. @@ -52,7 +52,7 @@ Summary: Web Console for Linux servers License: LGPLv2+ URL: https://cockpit-project.org/ -Source0: https://github.com/cockpit-project/cockpit/releases/download/267/cockpit-267.tar.xz +Source0: https://github.com/cockpit-project/cockpit/releases/download/268/cockpit-268.tar.xz # in RHEL 8 the source package is duplicated: cockpit (building basic packages like cockpit-{bridge,system}) # and cockpit-appstream (building optional packages like cockpit-{pcp}) @@ -192,7 +192,14 @@ install -D -p -m 644 AUTHORS COPYING README.md %{buildroot}%{_docdir}/cockpit/ # only ship deprecated PatternFly API for stable releases %if 0%{?rhel} == 8 - ln -s cockpit.css.gz %{buildroot}/%{_datadir}/cockpit/base1/patternfly.css.gz + if [ -f %{buildroot}/%{_datadir}/cockpit/base1/cockpit.css.gz ]; then + ln -s cockpit.css.gz %{buildroot}/%{_datadir}/cockpit/base1/patternfly.css.gz + elif [ -f %{buildroot}/%{_datadir}/cockpit/base1/cockpit.css ]; then + ln -s cockpit.css %{buildroot}/%{_datadir}/cockpit/base1/patternfly.css + else + echo >&2 Neither cockpit.css.gz nor cockpit.css exists. + exit 1 + fi %endif # Build the package lists for resource packages @@ -683,6 +690,9 @@ via PackageKit. # The changelog is automatically generated and merged %changelog +* Thu Apr 28 2022 Cockpit Project - 268-1 +- Update to upstream 268 release + * Wed Apr 13 2022 Cockpit Project - 267-1 - Update to upstream 267 release diff --git a/plans/upstream.fmf b/plans/upstream.fmf index b465cde..2327511 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: "267" + ref: "268" execute: how: tmt diff --git a/sources b/sources index 8f6abb5..5cd03d8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cockpit-267.tar.xz) = 23aba77cbb902ed693dc148e2c2f164eb20bffb85907879fe6764e6cc69a2802252edd8527d63df1317b143901ba869b6ad3a135b65e7262f7068fa2e8d0ef28 +SHA512 (cockpit-268.tar.xz) = 0f053e12eb1a42857acd3c7c217e04ebb73ef482f1755f9078ae4fc6e067c78c1da2be80f745e7498723cf2cc3ac55a869916ba493130531917ac5a521a835b7