From a18e0cb2794a2ce776ce97ab348f625dfca868dc Mon Sep 17 00:00:00 2001 From: Packit Date: Wed, 20 Jul 2022 10:51:45 +0000 Subject: [PATCH] [packit] 273 upstream release Upstream tag: 273 Upstream commit: 33639ff7 Signed-off-by: Packit --- .gitignore | 1 + README.packit | 2 +- cockpit.spec | 22 +++++++----------- packit.yaml | 56 +++++++++++++++++++++------------------------- plans/upstream.fmf | 2 +- sources | 2 +- 6 files changed, 37 insertions(+), 48 deletions(-) diff --git a/.gitignore b/.gitignore index 2520087..4d8c2ff 100644 --- a/.gitignore +++ b/.gitignore @@ -237,3 +237,4 @@ /cockpit-270.tar.xz /cockpit-271.tar.xz /cockpit-272.tar.xz +/cockpit-273.tar.xz diff --git a/README.packit b/README.packit index d45074d..30a712f 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.52.2.dev24+geececf3. +The file was generated using packit 0.55.1.dev8+g432e38d. diff --git a/cockpit.spec b/cockpit.spec index 46a7a37..d316942 100644 --- a/cockpit.spec +++ b/cockpit.spec @@ -49,7 +49,7 @@ Summary: Web Console for Linux servers License: LGPLv2+ URL: https://cockpit-project.org/ -Version: 272 +Version: 273 Release: 1%{?dist} Source0: https://github.com/cockpit-project/cockpit/releases/download/%{version}/cockpit-%{version}.tar.xz @@ -182,23 +182,10 @@ install -p -m 644 tools/cockpit.pam $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/cockpit rm -f %{buildroot}/%{_libdir}/cockpit/*.so install -D -p -m 644 AUTHORS COPYING README.md %{buildroot}%{_docdir}/cockpit/ -# only ship deprecated PatternFly API for stable releases -%if 0%{?rhel} == 8 - 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 # cockpit-bridge is the basic dependency for all cockpit-* packages, so centrally own the page directory echo '%dir %{_datadir}/cockpit' > base.list echo '%dir %{_datadir}/cockpit/base1' >> base.list -echo '%dir %{_datadir}/cockpit/base1/fonts' >> base.list find %{buildroot}%{_datadir}/cockpit/base1 -type f -o -type l >> base.list echo '%{_sysconfdir}/cockpit/machines.d' >> base.list echo %{buildroot}%{_datadir}/polkit-1/actions/org.cockpit-project.cockpit-bridge.policy >> base.list @@ -676,6 +663,13 @@ via PackageKit. # The changelog is automatically generated and merged %changelog +* Wed Jul 20 2022 Packit - 273-1 +- Metrics: Display CPU temperature +- Networking: Suggest netmask and gateway addresses +- Software Updates: Optionally reboot after updating +- cockpit/ws container: Support modern SSH keys + + * Thu Jun 23 2022 Packit - 272-1 - Firewall: Edit custom services - Services: Pin services as favorites diff --git a/packit.yaml b/packit.yaml index 33c1e64..74f44c9 100644 --- a/packit.yaml +++ b/packit.yaml @@ -32,8 +32,7 @@ copy_upstream_release_description: true jobs: - job: tests trigger: pull_request - metadata: - targets: + targets: - fedora-35 - fedora-36 - fedora-development @@ -43,23 +42,21 @@ jobs: # run build/unit tests on some interesting architectures - job: copr_build trigger: pull_request - metadata: - targets: - # 32 bit - - fedora-development-i386 - # big-endian - - fedora-development-s390x + targets: + # 32 bit + - fedora-development-i386 + # big-endian + - fedora-development-s390x - job: copr_build trigger: release - metadata: - owner: "@cockpit" - project: "cockpit-preview" - preserve_project: True - # HACK: hardcoding this list is redundant and hard to change; packit - # should just use the existing config for permanent COPRs; - # https://github.com/packit/packit-service/issues/1499 - targets: + owner: "@cockpit" + project: "cockpit-preview" + preserve_project: True + # HACK: hardcoding this list is redundant and hard to change; packit + # should just use the existing config for permanent COPRs; + # https://github.com/packit/packit-service/issues/1499 + targets: - fedora-35 - fedora-36 - fedora-development @@ -79,24 +76,21 @@ jobs: - job: propose_downstream trigger: release - metadata: - dist_git_branches: - - fedora-development - - fedora-35 - - fedora-36 + dist_git_branches: + - fedora-development + - fedora-35 + - fedora-36 - job: koji_build trigger: commit - metadata: - dist_git_branches: - - fedora-development - - fedora-35 - - fedora-36 + dist_git_branches: + - fedora-development + - fedora-35 + - fedora-36 - job: bodhi_update trigger: commit - metadata: - dist_git_branches: - # rawhide updates are created automatically - - fedora-35 - - fedora-36 + dist_git_branches: + # rawhide updates are created automatically + - fedora-35 + - fedora-36 diff --git a/plans/upstream.fmf b/plans/upstream.fmf index 74776c8..1efb3cd 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: "272" + ref: "273" execute: how: tmt diff --git a/sources b/sources index dc22c17..18e0515 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cockpit-272.tar.xz) = 1d4460f46714fd262cde3983771c52d172d96877278c40d69a40dfe3e78bc5d23a04088124449ecfdc5723afa8543b8b6e90f3addb3f305d4fb59407492aaa0c +SHA512 (cockpit-273.tar.xz) = 5e6c6cc70f2a2b89ae80873716fe245f7a0a517e2d6da5de5d2a255d2b1102f80c17621863547773ac6adb101c0df9f59e048950110f6a1c0fed2e67fa5249ae