Update to cockpit 306 and cockpit-machines 303 upstream releases
Resolves: jira#RHEL-17309
This commit is contained in:
Martin Pitt
parent
2a6123f615
commit
321a597107
@ -28,7 +28,7 @@
|
||||
# we maintain the basic/optional split, then it can be replaced with just %{version}.
|
||||
%define required_base 266
|
||||
|
||||
%define machines_version 302
|
||||
%define machines_version 303
|
||||
|
||||
# we generally want CentOS packages to be like RHEL; special cases need to check %{centos} explicitly
|
||||
%if 0%{?centos}
|
||||
@ -51,7 +51,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: https://github.com/cockpit-project/cockpit-machines/releases/download/%{machines_version}/cockpit-machines-%{machines_version}.tar.xz
|
||||
@ -89,6 +89,14 @@ Source1: https://github.com/cockpit-project/cockpit-machines/releases/dow
|
||||
%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
|
||||
@ -127,15 +135,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
|
||||
@ -203,6 +215,9 @@ BuildRequires: python3-tox-current-env
|
||||
%if 0%{?build_basic} == 0
|
||||
--disable-ssh \
|
||||
%endif
|
||||
%if %{build_pcp} == 0
|
||||
--disable-pcp \
|
||||
%endif
|
||||
|
||||
%make_build
|
||||
|
||||
@ -235,8 +250,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
|
||||
@ -432,7 +449,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
|
||||
@ -792,6 +809,8 @@ If "virt-install" is installed, you can also create new virtual machines.
|
||||
%files -n cockpit-machines -f machines.list
|
||||
%{_datadir}/metainfo/org.cockpit-project.machines.metainfo.xml
|
||||
|
||||
%if %{build_pcp}
|
||||
|
||||
%package -n cockpit-pcp
|
||||
Summary: Cockpit PCP integration
|
||||
Requires: cockpit-bridge >= %{required_base}
|
||||
@ -807,6 +826,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
|
||||
@ -827,6 +848,9 @@ via PackageKit.
|
||||
|
||||
# The changelog is automatically generated and merged
|
||||
%changelog
|
||||
* Wed Nov 29 2023 Martin Pitt <mpitt@redhat.com> - 306-1
|
||||
- Machines: Change "Add disk" default behavior
|
||||
|
||||
* Thu Nov 23 2023 Martin Pitt <mpitt@redhat.com> - 305-1
|
||||
- Performance and stability improvements
|
||||
|
||||
|
||||
@ -2,7 +2,7 @@ discover:
|
||||
how: fmf
|
||||
# for machines tests; keep in sync with cockpit-appstream.spec
|
||||
url: https://github.com/cockpit-project/cockpit-machines
|
||||
ref: "302"
|
||||
ref: "303"
|
||||
|
||||
execute:
|
||||
how: tmt
|
||||
@ -11,7 +11,7 @@ execute:
|
||||
summary: Run Cockpit tests for optional packages
|
||||
discover+:
|
||||
url: https://github.com/cockpit-project/cockpit
|
||||
ref: "305"
|
||||
ref: "306"
|
||||
test: /test/browser/optional
|
||||
|
||||
/machines-basic:
|
||||
|
||||
4
sources
4
sources
@ -1,2 +1,2 @@
|
||||
SHA512 (cockpit-305.tar.xz) = d1fc38b4f1566bcab79fc4558a072955ba100fbda9f13af694fe060225ee3c84de5d15a146784ba816711bf51d0203986192c7ab720f4ec6a7044125340204a7
|
||||
SHA512 (cockpit-machines-302.tar.xz) = bd5d3da7f66d78484413e1aa4947a0ccc9db23abe5f4758dafc0c50ad50636bbcad482db9b6781ba20bec18c7fcd4c84006fc5998f9c14a1d6e7f583f1248567
|
||||
SHA512 (cockpit-306.tar.xz) = aed080a00d4cac50a87fdf22b92635e9f63b0944103868d0e666798380309acdc06de62ff26846f87c5d894b2383b4fee6ad720f4a4105ebe8e75b8ff768c8b8
|
||||
SHA512 (cockpit-machines-303.tar.xz) = b20873c99b8d477062c43c61d5681ab1b23f6e9babff42d587f7ff5f3a2c7711952faac20240bd5b331e2707fd61c9a53bb8509a1d49b57967be355d4712993a
|
||||
|
||||
Loading…
Reference in New Issue
Block a user