import cockpit-272-2.el8

This commit is contained in:
CentOS Sources 2022-07-02 00:09:55 +00:00 committed by Stepan Oksanichenko
parent 92107eaddf
commit ac63cedf3e
3 changed files with 37 additions and 31 deletions

View File

@ -1 +1 @@
5676a0fff8737e04c5b6acdac71a8f0a27a36574 SOURCES/cockpit-270.tar.xz
c294c73d859a9cb1eaba67e9b06da2936a72babb SOURCES/cockpit-272.tar.xz

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/cockpit-270.tar.xz
SOURCES/cockpit-272.tar.xz

View File

@ -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
Release: 1%{?dist}
Source0: https://github.com/cockpit-project/cockpit/releases/download/270/cockpit-270.tar.xz
Version: 272
Release: 2%{?dist}
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 0
%if 0%{?rhel} == 8 && 0%{?epel} == 0 && !%{build_all}
%define build_all 1
%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,14 @@ via PackageKit.
# The changelog is automatically generated and merged
%changelog
* Wed Jun 29 2022 Martin Pitt <mpitt@redhat.com> - 272-2
- No-change rebuild due to brew confusion
* Thu Jun 23 2022 Matej Marusak <mmarusak@redhat.com> - 272-1
- Firewall: Edit custom services
- Services: Pin services as favorites
- Login: Dark mode
* Wed May 25 2022 Martin Pitt <mpitt@redhat.com> - 270-1
- Services: User-created timer deletion
- System Diagnostics: Working with diagnostic reports has been improved