diff --git a/.gitignore b/.gitignore index 72938eb..2520087 100644 --- a/.gitignore +++ b/.gitignore @@ -236,3 +236,4 @@ /cockpit-269.tar.xz /cockpit-270.tar.xz /cockpit-271.tar.xz +/cockpit-272.tar.xz diff --git a/README.packit b/README.packit index c8fb20b..d45074d 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.1.dev6+g4153106. +The file was generated using packit 0.52.2.dev24+geececf3. diff --git a/cockpit.spec b/cockpit.spec index d82d20d..46a7a37 100644 --- a/cockpit.spec +++ b/cockpit.spec @@ -24,9 +24,9 @@ # Check first cockpit-devel@lists.fedorahosted.org # -# earliest base that the subpackages work on; the instances of this get computed/updated -# by tools/gen-spec-dependencies during "make dist", but keep a hardcoded fallback -%define required_base 122 +# earliest base that the subpackages work on; this is still required as long as +# we maintain the basic/optional split, then it can be replaced with just %{version}. +%define required_base 266 # we generally want CentOS packages to be like RHEL; special cases need to check %{centos} explicitly %if 0%{?centos} @@ -49,17 +49,17 @@ Summary: Web Console for Linux servers License: LGPLv2+ URL: https://cockpit-project.org/ -Version: 271 +Version: 272 Release: 1%{?dist} -Source0: https://github.com/cockpit-project/cockpit/releases/download/271/cockpit-271.tar.xz +Source0: https://github.com/cockpit-project/cockpit/releases/download/%{version}/cockpit-%{version}.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}) -# This split does not apply to EPEL/COPR. +# This split does not apply to EPEL/COPR nor packit c8s builds, only to our own +# image-prepare rhel-8-Y builds (which will disable build_all). # In Fedora ELN/RHEL 9+ there is just one source package, which ships rpms in both BaseOS and AppStream -# We also provide an override mechanism if you want to build all packages. %define build_all 1 -%if 0%{?rhel} == 8 && 0%{?epel} == 0 && !%{build_all} +%if 0%{?rhel} == 8 && 0%{?epel} == 0 && !0%{?build_all} %if "%{name}" == "cockpit" %define build_basic 1 @@ -403,8 +403,6 @@ Provides: cockpit-sosreport = %{version}-%{release} %if 0%{?fedora} Recommends: (reportd if abrt) %endif -# NPM modules which are also available as packages -Provides: bundled(xstatic-patternfly-common) = 3.59.5 %description system This package contains the Cockpit shell and system configuration interfaces. @@ -531,8 +529,8 @@ fi %package kdump Summary: Cockpit user interface for kernel crash dumping -Requires: cockpit-bridge >= 130 -Requires: cockpit-shell >= 130 +Requires: cockpit-bridge >= %{required_base} +Requires: cockpit-shell >= %{required_base} Requires: kexec-tools BuildArch: noarch @@ -544,8 +542,8 @@ The Cockpit component for configuring kernel crash dumping. %package sosreport Summary: Cockpit user interface for diagnostic reports -Requires: cockpit-bridge >= 122 -Requires: cockpit-shell >= 122 +Requires: cockpit-bridge >= %{required_base} +Requires: cockpit-shell >= %{required_base} Requires: sos BuildArch: noarch @@ -559,8 +557,8 @@ sosreport tool. %package networkmanager Summary: Cockpit user interface for networking, using NetworkManager -Requires: cockpit-bridge >= 186 -Requires: cockpit-shell >= 186 +Requires: cockpit-bridge >= %{required_base} +Requires: cockpit-shell >= %{required_base} Requires: NetworkManager >= 1.6 # Optional components Recommends: NetworkManager-team @@ -577,8 +575,8 @@ The Cockpit component for managing networking. This package uses NetworkManager %package selinux Summary: Cockpit SELinux package -Requires: cockpit-bridge >= 122 -Requires: cockpit-shell >= 122 +Requires: cockpit-bridge >= %{required_base} +Requires: cockpit-shell >= %{required_base} Requires: setroubleshoot-server >= 3.3.3 BuildArch: noarch @@ -608,7 +606,7 @@ Dummy package from building optional packages only; never install or publish me. %package -n cockpit-storaged Summary: Cockpit user interface for storage, using udisks -Requires: cockpit-shell >= 266 +Requires: cockpit-shell >= %{required_base} Requires: udisks2 >= 2.9 Recommends: udisks2-lvm2 >= 2.9 Recommends: udisks2-iscsi >= 2.9 @@ -645,7 +643,7 @@ These files are not required for running Cockpit. %package -n cockpit-pcp Summary: Cockpit PCP integration -Requires: cockpit-bridge >= 238.1.1 +Requires: cockpit-bridge >= %{required_base} Requires: pcp %description -n cockpit-pcp @@ -661,7 +659,7 @@ systemctl reload-or-try-restart pmlogger %package -n cockpit-packagekit Summary: Cockpit user interface for packages BuildArch: noarch -Requires: cockpit-bridge >= 186 +Requires: cockpit-bridge >= %{required_base} Requires: PackageKit Recommends: python3-tracer # HACK: https://bugzilla.redhat.com/show_bug.cgi?id=1800468 @@ -678,6 +676,13 @@ via PackageKit. # The changelog is automatically generated and merged %changelog +* Thu Jun 23 2022 Packit - 272-1 +- Firewall: Edit custom services +- Services: Pin services as favorites +- Login: Dark mode +- Unprivileged cockpit/ws container mode + + * Wed Jun 08 2022 Packit - 271-1 - Tests improvements and stabilization diff --git a/packit.yaml b/packit.yaml index ccc1da9..33c1e64 100644 --- a/packit.yaml +++ b/packit.yaml @@ -1,9 +1,10 @@ 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: packit's "fix spec file" stage does not kick in here, and it does not take the spec from the tarball - # https://github.com/packit/packit-service/issues/1515 - - sh -exc 'tools/create-spec --version $(git describe | tr - .) --build-all -o cockpit.spec tools/cockpit.spec.in' + # HACK: spec must be next to the generated tarball; https://github.com/packit/packit/issues/1621 + - cp tools/cockpit.spec . # HACK: until FMF uses tests from dist-git source tarball: https://github.com/teemtee/tmt/issues/585 - sh -exc 'mkdir -p tmp; curl --silent --fail https://src.fedoraproject.org/rpms/cockpit/raw/rawhide/f/plans/upstream.fmf | sed -r "/ref:/ s/[0-9.]+/$(git describe --abbrev=0)/" > tmp/upstream.fmf' @@ -55,6 +56,9 @@ jobs: 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 @@ -63,10 +67,10 @@ jobs: - centos-stream-9-x86_64 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 - # packit will overwrite the version in its "fix spec file" stage - - tools/create-spec --version 0 --build-all -o cockpit.spec tools/cockpit.spec.in # 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: diff --git a/plans/upstream.fmf b/plans/upstream.fmf index 0ee8789..74776c8 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: "271" + ref: "272" execute: how: tmt diff --git a/sources b/sources index fd7fd6f..dc22c17 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cockpit-271.tar.xz) = f5ac41236e9fa7d90c5a9c3f3860ae30d42363966557dd2e00659f84651ee8415d30e354bf371fec9d6156303f0c93c4d060656605dda24102a0e9cc32d00d78 +SHA512 (cockpit-272.tar.xz) = 1d4460f46714fd262cde3983771c52d172d96877278c40d69a40dfe3e78bc5d23a04088124449ecfdc5723afa8543b8b6e90f3addb3f305d4fb59407492aaa0c