From 3d80facadbe20754c37b792a4eddf6218c108546 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Thu, 23 Jun 2022 21:37:08 +0200 Subject: [PATCH] New upstream release 272 Resolves: rhbz#2073263 Resolves: rhbz#2097010 --- .gitignore | 1 + cockpit.spec | 63 ++++++++++++++++++++++++++-------------------- plans/upstream.fmf | 2 +- sources | 2 +- 4 files changed, 39 insertions(+), 29 deletions(-) diff --git a/.gitignore b/.gitignore index 6dbb709..e5bbcb6 100644 --- a/.gitignore +++ b/.gitignore @@ -235,3 +235,4 @@ /cockpit-268.1.tar.xz /cockpit-269.tar.xz /cockpit-270.tar.xz +/cockpit-272.tar.xz diff --git a/cockpit.spec b/cockpit.spec index dca9a95..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: 270 +Version: 272 Release: 1%{?dist} -Source0: https://github.com/cockpit-project/cockpit/releases/download/270/cockpit-270.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 @@ -150,7 +150,7 @@ Recommends: (cockpit-networkmanager if NetworkManager) Suggests: cockpit-selinux %endif %if 0%{?rhel} && 0%{?centos} == 0 -Recommends: subscription-manager-cockpit +Requires: subscription-manager-cockpit %endif %prep @@ -388,23 +388,21 @@ Provides: cockpit-tuned = %{version}-%{release} Provides: cockpit-users = %{version}-%{release} Obsoletes: cockpit-dashboard < %{version}-%{release} %if 0%{?rhel} -Provides: cockpit-networkmanager = %{version}-%{release} Requires: NetworkManager >= 1.6 -Provides: cockpit-kdump = %{version}-%{release} Requires: kexec-tools -Recommends: (sudo or polkit) +Requires: sos +Requires: sudo Recommends: PackageKit -Recommends: NetworkManager-team Recommends: setroubleshoot-server >= 3.3.3 +Suggests: NetworkManager-team +Provides: cockpit-kdump = %{version}-%{release} +Provides: cockpit-networkmanager = %{version}-%{release} Provides: cockpit-selinux = %{version}-%{release} Provides: cockpit-sosreport = %{version}-%{release} -Requires: sos %endif %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 >= 186 +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,17 @@ 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 + + * Tue May 24 2022 Packit - 270-1 - Services: User-created timer deletion - System Diagnostics: Working with diagnostic reports has been improved diff --git a/plans/upstream.fmf b/plans/upstream.fmf index 32409f9..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: "270" + ref: "272" execute: how: tmt diff --git a/sources b/sources index 2a0f16e..dc22c17 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cockpit-270.tar.xz) = 7a2b94aee6f056e46114b072c46c9f85893427ebb58eb36f8d0e5e597eaa7b3a5c514d6c95ca1e4914783a2ab0c67fa5831e545486c7a2f6f07c5b7eab92af3a +SHA512 (cockpit-272.tar.xz) = 1d4460f46714fd262cde3983771c52d172d96877278c40d69a40dfe3e78bc5d23a04088124449ecfdc5723afa8543b8b6e90f3addb3f305d4fb59407492aaa0c