diff --git a/.gitignore b/.gitignore index e2fa8e9..d9f3ccf 100644 --- a/.gitignore +++ b/.gitignore @@ -247,3 +247,4 @@ /cockpit-278.tar.xz /cockpit-279.tar.xz /cockpit-280.tar.xz +/cockpit-280.1.tar.xz diff --git a/README.packit b/README.packit new file mode 100644 index 0000000..bdc4243 --- /dev/null +++ b/README.packit @@ -0,0 +1,3 @@ +This repository is maintained by packit. +https://packit.dev/ +The file was generated using packit 0.63.2.dev8+g33fd64a. diff --git a/cockpit.spec b/cockpit.spec index 98fdcf0..c945c87 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: 280 +Version: 280.1 Release: 1%{?dist} Source0: https://github.com/cockpit-project/cockpit/releases/download/%{version}/cockpit-%{version}.tar.xz @@ -322,8 +322,6 @@ troubleshooting, interactive command-line sessions, and more. Summary: Cockpit bridge server-side component Requires: glib-networking Provides: cockpit-ssh = %{version}-%{release} -# PR #10430 dropped workaround for ws' inability to understand x-host-key challenge -Conflicts: cockpit-ws < 181.x # 233 dropped jquery.js, pages started to bundle it (commit 049e8b8dce) Conflicts: cockpit-dashboard < 233 Conflicts: cockpit-networkmanager < 233 @@ -617,8 +615,8 @@ The Cockpit component for managing storage. This package uses udisks. %package -n cockpit-tests Summary: Tests for Cockpit -Requires: cockpit-bridge >= 138 -Requires: cockpit-system >= 138 +Requires: cockpit-bridge >= %{required_base} +Requires: cockpit-system >= %{required_base} Requires: openssh-clients Provides: cockpit-test-assets = %{version}-%{release} @@ -664,6 +662,10 @@ via PackageKit. # The changelog is automatically generated and merged %changelog +* Thu Nov 24 2022 Packit - 280.1-1 +- Exclude kpatch test on RHEL gating + + * Wed Nov 16 2022 Packit - 280-1 - tools: Disallow root login by default diff --git a/packit.yaml b/packit.yaml new file mode 100644 index 0000000..aa5104a --- /dev/null +++ b/packit.yaml @@ -0,0 +1,78 @@ +upstream_project_url: https://github.com/cockpit-project/cockpit +# HACK: spec must be next to the generated tarball; https://github.com/packit/packit/issues/1621 +specfile_path: cockpit.spec +actions: + post-upstream-clone: + # HACK: spec must be next to the generated tarball; https://github.com/packit/packit/issues/1621 + - cp tools/cockpit.spec . + + create-archive: + # The sandcastle doesn't have enough ram to run webpack, so wait + # until the webpack-jumpstart workflow has run and grab the result. + - tools/webpack-jumpstart --wait --rebase + - tools/make-dist + +srpm_build_deps: + - automake + - gcc + - glib2-devel + - make + - systemd-devel +# use the nicely formatted release NEWS from our upstream release, instead of git shortlog +copy_upstream_release_description: true +jobs: + - job: tests + trigger: pull_request + targets: + - fedora-36 + - fedora-37 + - fedora-development + - centos-stream-8-x86_64 + - centos-stream-9-x86_64 + + # run build/unit tests on some interesting architectures + - job: copr_build + trigger: pull_request + targets: + # 32 bit + - fedora-development-i386 + # big-endian + - fedora-development-s390x + + - job: copr_build + trigger: release + owner: "@cockpit" + project: "cockpit-preview" + preserve_project: True + actions: + post-upstream-clone: + # HACK: spec must be next to the generated tarball; https://github.com/packit/packit/issues/1621 + - cp tools/cockpit.spec . + # HACK: https://github.com/packit/packit/issues/1560 + - tools/node-modules checkout + # HACK: tarball for releases (copr_build, koji, etc.), copying spec's Source0; this + # really should be the default, see https://github.com/packit/packit-service/issues/1505 + create-archive: + - sh -exc "curl -L -O https://github.com/cockpit-project/cockpit/releases/download/${PACKIT_PROJECT_VERSION}/${PACKIT_PROJECT_NAME_VERSION}.tar.xz" + - sh -exc "ls ${PACKIT_PROJECT_NAME_VERSION}.tar.xz" + + - job: propose_downstream + trigger: release + dist_git_branches: + - fedora-development + - fedora-36 + - fedora-37 + + - job: koji_build + trigger: commit + dist_git_branches: + - fedora-development + - fedora-36 + - fedora-37 + + - job: bodhi_update + trigger: commit + dist_git_branches: + # rawhide updates are created automatically + - fedora-36 + - fedora-37 diff --git a/sources b/sources index 787ef82..63b2063 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cockpit-280.tar.xz) = 1f766c047bbc693465716919d93e6bdf4139cb99119b51df9132633b3f41e460ef2e29d9349fdb2caa96a27d90f0717901fffb1228564cd37068ed8365793384 +SHA512 (cockpit-280.1.tar.xz) = cbfaeb35ef49e390e21c95e743c4f24e8715a6f55fe294e2325bf5768fa371370f250916a21f33e90221ae5fde725ad5f5d6bfac766c2e2a80c57c79e363f421