import cockpit-appstream-272-1.el8

.cockpit-appstream.metadata

@@ -1,2 +1,2 @@
-5676a0fff8737e04c5b6acdac71a8f0a27a36574 SOURCES/cockpit-270.tar.xz
+c294c73d859a9cb1eaba67e9b06da2936a72babb SOURCES/cockpit-272.tar.xz
-13470d64f3c0899551b8f55cbe19285b2bc639f8 SOURCES/cockpit-machines-269.tar.xz
+fa3a90adf90380920f708db2c1b1ed19afbbeb67 SOURCES/cockpit-machines-271.tar.xz

.gitignore

@@ -1,2 +1,2 @@
-SOURCES/cockpit-270.tar.xz
+SOURCES/cockpit-272.tar.xz
-SOURCES/cockpit-machines-269.tar.xz
+SOURCES/cockpit-machines-271.tar.xz

SPECS/cockpit-appstream.spec

@@ -1,6 +1,3 @@
-# This spec file has been automatically updated
-Version:        270
-Release: 1%{?dist}
 #
 # Copyright (C) 2014-2020 Red Hat, Inc.
 #
@@ -27,11 +24,11 @@ Release: 1%{?dist}
 # Check first cockpit-devel@lists.fedorahosted.org
 #
 
-# earliest base that the subpackages work on; the instances of this get computed/updated
+# earliest base that the subpackages work on; this is still required as long as
-# by tools/gen-spec-dependencies during "make dist", but keep a hardcoded fallback
+# we maintain the basic/optional split, then it can be replaced with just %{version}.
-%define required_base 122
+%define required_base 266
 
-%define machines_version 269
+%define machines_version 271
 
 # we generally want CentOS packages to be like RHEL; special cases need to check %{centos} explicitly
 %if 0%{?centos}
@@ -54,16 +51,18 @@ Summary:        Web Console for Linux servers
 License:        LGPLv2+
 URL:            https://cockpit-project.org/
 
+Version:        272
+Release:        1%{?dist}
 Source0:        https://github.com/cockpit-project/cockpit/releases/download/%{version}/cockpit-%{version}.tar.xz
 Source1:        https://github.com/cockpit-project/cockpit-machines/releases/download/%{machines_version}/cockpit-machines-%{machines_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 0
-%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
@@ -154,7 +153,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
@@ -397,23 +396,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.
@@ -540,8 +537,8 @@ fi
 
 %package kdump
 Summary: Cockpit user interface for kernel crash dumping
-Requires: cockpit-bridge >= 122
+Requires: cockpit-bridge >= %{required_base}
-Requires: cockpit-shell >= 122
+Requires: cockpit-shell >= %{required_base}
 Requires: kexec-tools
 BuildArch: noarch
 
@@ -553,8 +550,8 @@ The Cockpit component for configuring kernel crash dumping.
 
 %package sosreport
 Summary: Cockpit user interface for diagnostic reports
-Requires: cockpit-bridge >= 122
+Requires: cockpit-bridge >= %{required_base}
-Requires: cockpit-shell >= 122
+Requires: cockpit-shell >= %{required_base}
 Requires: sos
 BuildArch: noarch
 
@@ -568,8 +565,8 @@ sosreport tool.
 
 %package networkmanager
 Summary: Cockpit user interface for networking, using NetworkManager
-Requires: cockpit-bridge >= 186
+Requires: cockpit-bridge >= %{required_base}
-Requires: cockpit-shell >= 186
+Requires: cockpit-shell >= %{required_base}
 Requires: NetworkManager >= 1.6
 # Optional components
 Recommends: NetworkManager-team
@@ -586,8 +583,8 @@ The Cockpit component for managing networking.  This package uses NetworkManager
 
 %package selinux
 Summary: Cockpit SELinux package
-Requires: cockpit-bridge >= 122
+Requires: cockpit-bridge >= %{required_base}
-Requires: cockpit-shell >= 122
+Requires: cockpit-shell >= %{required_base}
 Requires: setroubleshoot-server >= 3.3.3
 BuildArch: noarch
 
@@ -617,7 +614,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
@@ -682,7 +679,7 @@ If "virt-install" is installed, you can also create new virtual machines.
 
 %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
@@ -698,7 +695,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
@@ -715,6 +712,9 @@ via PackageKit.
 
 # The changelog is automatically generated and merged
 %changelog
+* Thu Jun 23 2022 Matej Marusak <mmarusak@redhat.com> - 272-1
+- Translation updates
+
 * Wed May 25 2022 Martin Pitt <mpitt@redhat.com> - 270-1
 - Machines: Redesign content removal dialogs