Update to cockpit 291 and cockpit-machines 289.1 upstream releases
Related: rhbz#2189559
This commit is contained in:
Packit
Martin Pitt
parent
4b7920d968
commit
05edbcff82
10
.gitignore
vendored
10
.gitignore
vendored
@ -1,8 +1,2 @@
|
||||
SOURCES/cockpit-286.1.tar.xz
|
||||
SOURCES/cockpit-machines-284.1.tar.xz
|
||||
/cockpit-286.1.tar.xz
|
||||
/cockpit-machines-284.1.tar.xz
|
||||
/cockpit-machines-287.tar.xz
|
||||
/cockpit-289.tar.xz
|
||||
/cockpit-290.tar.xz
|
||||
/cockpit-machines-288.tar.xz
|
||||
/cockpit-291.tar.xz
|
||||
/cockpit-machines-289.1.tar.xz
|
||||
|
||||
@ -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 288
|
||||
%define machines_version 289.1
|
||||
|
||||
# we generally want CentOS packages to be like RHEL; special cases need to check %{centos} explicitly
|
||||
%if 0%{?centos}
|
||||
@ -51,11 +51,16 @@ Summary: Web Console for Linux servers
|
||||
License: LGPLv2+
|
||||
URL: https://cockpit-project.org/
|
||||
|
||||
Version: 290
|
||||
Version: 291
|
||||
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
|
||||
|
||||
# Experimental Python support
|
||||
%if !%{defined cockpit_enable_python}
|
||||
%define cockpit_enable_python 0
|
||||
%endif
|
||||
|
||||
# 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 nor packit c8s builds, only to our own
|
||||
@ -165,6 +170,22 @@ Suggests: cockpit-selinux
|
||||
Requires: subscription-manager-cockpit
|
||||
%endif
|
||||
|
||||
%if %{cockpit_enable_python}
|
||||
BuildRequires: python3-devel
|
||||
BuildRequires: python3-pip
|
||||
BuildRequires: python3-setuptools
|
||||
BuildRequires: python3-wheel
|
||||
%if 0%{?rhel} == 0
|
||||
# All of these are only required for running pytest (which we only do on Fedora)
|
||||
BuildRequires: procps-ng
|
||||
BuildRequires: pyproject-rpm-macros
|
||||
BuildRequires: python3-pytest-asyncio
|
||||
BuildRequires: python3-pytest-cov
|
||||
BuildRequires: python3-pytest-timeout
|
||||
BuildRequires: python3-tox-current-env
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%prep
|
||||
%setup -q -T -a 1 -c -n cockpit-machines-%{machines_version}
|
||||
%setup -q -n cockpit-%{version}
|
||||
@ -178,6 +199,9 @@ Requires: subscription-manager-cockpit
|
||||
--docdir=%_defaultdocdir/%{name} \
|
||||
%endif
|
||||
--with-pamdir='%{pamdir}' \
|
||||
%if %{cockpit_enable_python}
|
||||
--enable-pybridge \
|
||||
%endif
|
||||
%if 0%{?build_basic} == 0
|
||||
--disable-ssh \
|
||||
%endif
|
||||
@ -187,6 +211,10 @@ Requires: subscription-manager-cockpit
|
||||
%check
|
||||
make -j$(nproc) check
|
||||
|
||||
%if %{cockpit_enable_python} && 0%{?rhel} == 0
|
||||
%tox
|
||||
%endif
|
||||
|
||||
%install
|
||||
%make_install
|
||||
make install-tests DESTDIR=%{buildroot}
|
||||
@ -265,13 +293,15 @@ done
|
||||
rm -r %{buildroot}/%{_prefix}/%{__lib}/tmpfiles.d
|
||||
find %{buildroot}/%{_unitdir}/ -type f ! -name 'cockpit-session*' -delete
|
||||
for libexec in cockpit-askpass cockpit-session cockpit-ws cockpit-tls cockpit-wsinstance-factory cockpit-client cockpit-client.ui cockpit-desktop cockpit-certificate-helper cockpit-certificate-ensure; do
|
||||
rm %{buildroot}/%{_libexecdir}/$libexec
|
||||
rm -f %{buildroot}/%{_libexecdir}/$libexec
|
||||
done
|
||||
rm -r %{buildroot}/%{_sysconfdir}/pam.d %{buildroot}/%{_sysconfdir}/motd.d %{buildroot}/%{_sysconfdir}/issue.d
|
||||
rm -f %{buildroot}/%{_libdir}/security/pam_*
|
||||
rm %{buildroot}/usr/bin/cockpit-bridge
|
||||
rm -f %{buildroot}/usr/bin/cockpit-bridge
|
||||
rm -f %{buildroot}%{_libexecdir}/cockpit-ssh
|
||||
rm -f %{buildroot}%{_datadir}/metainfo/cockpit.appdata.xml
|
||||
rm -rf %{buildroot}%{python3_sitelib}/cockpit/
|
||||
rm -rf %{buildroot}%{python3_sitelib}/cockpit-%{version}.dist-info/
|
||||
%endif
|
||||
|
||||
# when not building optional packages, remove their files
|
||||
@ -352,6 +382,10 @@ system on behalf of the web based user interface.
|
||||
%doc %{_mandir}/man1/cockpit-bridge.1.gz
|
||||
%{_bindir}/cockpit-bridge
|
||||
%{_libexecdir}/cockpit-askpass
|
||||
%if %{cockpit_enable_python}
|
||||
%{python3_sitelib}/%{name}/
|
||||
%{python3_sitelib}/%{name}-%{version}.dist-info/
|
||||
%endif
|
||||
|
||||
%package doc
|
||||
Summary: Cockpit deployment and developer guide
|
||||
@ -400,23 +434,22 @@ Provides: cockpit-sosreport = %{version}-%{release}
|
||||
Recommends: (reportd if abrt)
|
||||
%endif
|
||||
|
||||
Provides: bundled(npm(@patternfly/patternfly)) = 4.224.4
|
||||
Provides: bundled(npm(@patternfly/react-core)) = 4.276.9
|
||||
Provides: bundled(npm(@patternfly/react-icons)) = 4.93.6
|
||||
Provides: bundled(npm(@patternfly/react-styles)) = 4.92.7
|
||||
Provides: bundled(npm(@patternfly/react-table)) = 4.113.1
|
||||
Provides: bundled(npm(@patternfly/react-tokens)) = 4.94.6
|
||||
Provides: bundled(npm(@patternfly/patternfly)) = 5.0.0-alpha.40
|
||||
Provides: bundled(npm(@patternfly/react-core)) = 5.0.0-alpha.72
|
||||
Provides: bundled(npm(@patternfly/react-icons)) = 5.0.0-alpha.10
|
||||
Provides: bundled(npm(@patternfly/react-styles)) = 5.0.0-alpha.7
|
||||
Provides: bundled(npm(@patternfly/react-table)) = 5.0.0-alpha.74
|
||||
Provides: bundled(npm(@patternfly/react-tokens)) = 5.0.0-alpha.7
|
||||
Provides: bundled(npm(argparse)) = 1.0.10
|
||||
Provides: bundled(npm(attr-accept)) = 1.1.3
|
||||
Provides: bundled(npm(attr-accept)) = 2.2.2
|
||||
Provides: bundled(npm(autolinker)) = 3.16.2
|
||||
Provides: bundled(npm(available-typed-arrays)) = 1.0.5
|
||||
Provides: bundled(npm(call-bind)) = 1.0.2
|
||||
Provides: bundled(npm(core-js)) = 2.6.12
|
||||
Provides: bundled(npm(deep-equal)) = 2.0.5
|
||||
Provides: bundled(npm(define-properties)) = 1.2.0
|
||||
Provides: bundled(npm(es-get-iterator)) = 1.1.3
|
||||
Provides: bundled(npm(file-selector)) = 0.1.19
|
||||
Provides: bundled(npm(focus-trap)) = 6.9.2
|
||||
Provides: bundled(npm(file-selector)) = 0.6.0
|
||||
Provides: bundled(npm(focus-trap)) = 7.4.0
|
||||
Provides: bundled(npm(for-each)) = 0.3.3
|
||||
Provides: bundled(npm(function-bind)) = 1.1.1
|
||||
Provides: bundled(npm(functions-have-names)) = 1.2.3
|
||||
@ -454,25 +487,21 @@ Provides: bundled(npm(object-inspect)) = 1.12.3
|
||||
Provides: bundled(npm(object-is)) = 1.1.5
|
||||
Provides: bundled(npm(object-keys)) = 1.1.1
|
||||
Provides: bundled(npm(object.assign)) = 4.1.4
|
||||
Provides: bundled(npm(popper.js)) = 1.16.1
|
||||
Provides: bundled(npm(prop-types-extra)) = 1.1.1
|
||||
Provides: bundled(npm(prop-types)) = 15.8.1
|
||||
Provides: bundled(npm(react-dom)) = 18.2.0
|
||||
Provides: bundled(npm(react-dropzone)) = 9.0.0
|
||||
Provides: bundled(npm(react-dropzone)) = 14.2.3
|
||||
Provides: bundled(npm(react-is)) = 16.13.1
|
||||
Provides: bundled(npm(react)) = 18.2.0
|
||||
Provides: bundled(npm(regexp.prototype.flags)) = 1.4.3
|
||||
Provides: bundled(npm(regexp.prototype.flags)) = 1.5.0
|
||||
Provides: bundled(npm(remarkable)) = 2.0.1
|
||||
Provides: bundled(npm(scheduler)) = 0.23.0
|
||||
Provides: bundled(npm(side-channel)) = 1.0.4
|
||||
Provides: bundled(npm(sprintf-js)) = 1.0.3
|
||||
Provides: bundled(npm(stop-iteration-iterator)) = 1.0.0
|
||||
Provides: bundled(npm(tabbable)) = 5.3.3
|
||||
Provides: bundled(npm(tabbable)) = 6.1.1
|
||||
Provides: bundled(npm(throttle-debounce)) = 2.3.0
|
||||
Provides: bundled(npm(tippy.js)) = 5.1.2
|
||||
Provides: bundled(npm(tslib)) = 2.5.0
|
||||
Provides: bundled(npm(uuid)) = 7.0.3
|
||||
Provides: bundled(npm(warning)) = 4.0.3
|
||||
Provides: bundled(npm(which-boxed-primitive)) = 1.0.2
|
||||
Provides: bundled(npm(which-collection)) = 1.0.1
|
||||
Provides: bundled(npm(which-typed-array)) = 1.1.9
|
||||
@ -789,6 +818,11 @@ via PackageKit.
|
||||
|
||||
# The changelog is automatically generated and merged
|
||||
%changelog
|
||||
* Tue May 09 2023 Martin Pitt <mpitt@redhat.com> - 291-1
|
||||
- Update to PatternFly 5 Alpha
|
||||
- Machines: Option to use RAW volume during VM creation
|
||||
- Machines: Redesign VM’s CPU configuration
|
||||
|
||||
* Wed Apr 06 2023 Katerina Koukiou <kkoukiou@redhat.com> - 289-1
|
||||
- Machines: Show an alert when virtualization is disabled in BIOS/EFI
|
||||
- Storage: Mounting filesystems at boot time
|
||||
|
||||
@ -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: "288"
|
||||
ref: "289.1"
|
||||
|
||||
execute:
|
||||
how: tmt
|
||||
@ -11,7 +11,7 @@ execute:
|
||||
summary: Run Cockpit tests for optional packages
|
||||
discover+:
|
||||
url: https://github.com/cockpit-project/cockpit
|
||||
ref: "290"
|
||||
ref: "291"
|
||||
test: /test/browser/optional
|
||||
|
||||
/machines-basic:
|
||||
|
||||
4
sources
4
sources
@ -1,2 +1,2 @@
|
||||
SHA512 (cockpit-290.tar.xz) = fb7010cbd247b4a348f28ca86e2e3f74747707ca36d1ba17972864c1f2d3541d814cec7b4c0ff4cf4998a58a906cb4ec2e17e60400888eb4573e177d04c8bb55
|
||||
SHA512 (cockpit-machines-288.tar.xz) = d15e7d746c5474cbf52bcf561f2ee5dda0489e9462b1e346cb47acefbf8ce0b0304eac75baa23dbc5f57d6ffd2f2dfcff128714dbf99fa93e57381cceeffff22
|
||||
SHA512 (cockpit-291.tar.xz) = 9e3015f9c847b7d6fc5620d4953c4f09784e4df1dafa5c68437459850fcfb845b05815d3359a60fabd2dbdb196af4358f218cda7c55855e89a71e7d4b63bd131
|
||||
SHA512 (cockpit-machines-289.1.tar.xz) = 476271b9a3f72f16dd775a2dea8c65a5326a208bddf482bd821470828f97a769d99c760c305631836be7e006d35aa541c0ac5c3f2d3994797bffae77d9610d34
|
||||
|
||||
Loading…
Reference in New Issue
Block a user