Update to upstream release 306
Related: jira#RHEL-16681
This commit is contained in:
parent
ad8b77720b
commit
ed1009519d
28
cockpit.spec
28
cockpit.spec
@ -49,7 +49,7 @@ Summary: Web Console for Linux servers
|
||||
License: LGPL-2.1-or-later
|
||||
URL: https://cockpit-project.org/
|
||||
|
||||
Version: 305
|
||||
Version: 306
|
||||
Release: 1%{?dist}
|
||||
Source0: https://github.com/cockpit-project/cockpit/releases/download/%{version}/cockpit-%{version}.tar.xz
|
||||
Source1: cockpit.css.gz
|
||||
@ -86,6 +86,14 @@ Source1: cockpit.css.gz
|
||||
%define disallow_root 1
|
||||
%endif
|
||||
|
||||
# pcp stopped building on ix86
|
||||
%define build_pcp 1
|
||||
%if 0%{?fedora} >= 40 || 0%{?rhel} >= 10
|
||||
%ifarch %ix86
|
||||
%define build_pcp 0
|
||||
%endif
|
||||
%endif
|
||||
|
||||
# Ship custom SELinux policy (but not for cockpit-appstream)
|
||||
%if "%{name}" == "cockpit"
|
||||
%define selinuxtype targeted
|
||||
@ -124,15 +132,19 @@ BuildRequires: glib2-devel >= 2.50.0
|
||||
BuildRequires: systemd-devel >= 235
|
||||
%if 0%{?suse_version}
|
||||
BuildRequires: distribution-release
|
||||
%if %{build_pcp}
|
||||
BuildRequires: libpcp-devel
|
||||
BuildRequires: pcp-devel
|
||||
BuildRequires: libpcp3
|
||||
BuildRequires: libpcp_import1
|
||||
%endif
|
||||
BuildRequires: openssh
|
||||
BuildRequires: distribution-logos
|
||||
BuildRequires: wallpaper-branding
|
||||
%else
|
||||
%if %{build_pcp}
|
||||
BuildRequires: pcp-libs-devel
|
||||
%endif
|
||||
BuildRequires: openssh-clients
|
||||
BuildRequires: docbook-style-xsl
|
||||
%endif
|
||||
@ -199,6 +211,9 @@ BuildRequires: python3-tox-current-env
|
||||
%if 0%{?build_basic} == 0
|
||||
--disable-ssh \
|
||||
%endif
|
||||
%if %{build_pcp} == 0
|
||||
--disable-pcp \
|
||||
%endif
|
||||
|
||||
%make_build
|
||||
|
||||
@ -234,8 +249,10 @@ find %{buildroot}%{_datadir}/cockpit/ssh -type f >> base.list
|
||||
%endif
|
||||
echo '%{_libexecdir}/cockpit-ssh' >> base.list
|
||||
|
||||
%if %{build_pcp}
|
||||
echo '%dir %{_datadir}/cockpit/pcp' > pcp.list
|
||||
find %{buildroot}%{_datadir}/cockpit/pcp -type f >> pcp.list
|
||||
%endif
|
||||
|
||||
echo '%dir %{_datadir}/cockpit/shell' >> system.list
|
||||
find %{buildroot}%{_datadir}/cockpit/shell -type f >> system.list
|
||||
@ -428,7 +445,7 @@ Provides: cockpit-sosreport = %{version}-%{release}
|
||||
Recommends: (reportd if abrt)
|
||||
%endif
|
||||
|
||||
Provides: bundled(npm(@babel/runtime)) = 7.23.2
|
||||
Provides: bundled(npm(@babel/runtime)) = 7.23.4
|
||||
Provides: bundled(npm(@patternfly/patternfly)) = 5.1.0
|
||||
Provides: bundled(npm(@patternfly/react-core)) = 5.1.1
|
||||
Provides: bundled(npm(@patternfly/react-icons)) = 5.1.1
|
||||
@ -759,6 +776,8 @@ These files are not required for running Cockpit.
|
||||
%{_unitdir}/cockpit-session.socket
|
||||
%{_unitdir}/cockpit-session@.service
|
||||
|
||||
%if %{build_pcp}
|
||||
|
||||
%package -n cockpit-pcp
|
||||
Summary: Cockpit PCP integration
|
||||
Requires: cockpit-bridge >= %{required_base}
|
||||
@ -774,6 +793,8 @@ Cockpit support for reading PCP metrics and loading PCP archives.
|
||||
%post -n cockpit-pcp
|
||||
systemctl reload-or-try-restart pmlogger
|
||||
|
||||
%endif
|
||||
|
||||
%package -n cockpit-packagekit
|
||||
Summary: Cockpit user interface for packages
|
||||
BuildArch: noarch
|
||||
@ -794,6 +815,9 @@ via PackageKit.
|
||||
|
||||
# The changelog is automatically generated and merged
|
||||
%changelog
|
||||
* Wed Nov 29 2023 Packit <hello@packit.dev> - 306-1
|
||||
- Kdump: Add Ansible/shell automation
|
||||
|
||||
* Wed Nov 15 2023 Packit <hello@packit.dev> - 305-1
|
||||
- Performance and stability improvements
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
discover:
|
||||
how: fmf
|
||||
url: https://github.com/cockpit-project/cockpit
|
||||
ref: "305"
|
||||
ref: "306"
|
||||
execute:
|
||||
how: tmt
|
||||
|
||||
|
2
sources
2
sources
@ -1,2 +1,2 @@
|
||||
SHA512 (cockpit-305.tar.xz) = d1fc38b4f1566bcab79fc4558a072955ba100fbda9f13af694fe060225ee3c84de5d15a146784ba816711bf51d0203986192c7ab720f4ec6a7044125340204a7
|
||||
SHA512 (cockpit-306.tar.xz) = aed080a00d4cac50a87fdf22b92635e9f63b0944103868d0e666798380309acdc06de62ff26846f87c5d894b2383b4fee6ad720f4a4105ebe8e75b8ff768c8b8
|
||||
SHA512 (cockpit.css.gz) = 1851e890e49141c17e498f1472c3bc307439cefaa0f1dccecbfc87b04087af03ca42199c86116c1fcf8890b58ca98f8aecfb01cc8b3c03a76e2685f7bd610568
|
||||
|
Loading…
Reference in New Issue
Block a user