Update to cockpit 300 and cockpit-machines 298 upstream releases

Related: rhbz#2189559
This commit is contained in:
Martin Pitt 2023-09-06 15:57:11 +02:00
parent cfd4feacb5
commit cdb5a3eb63
3 changed files with 12 additions and 7 deletions

View File

@ -28,7 +28,7 @@
# we maintain the basic/optional split, then it can be replaced with just %{version}. # we maintain the basic/optional split, then it can be replaced with just %{version}.
%define required_base 266 %define required_base 266
%define machines_version 297 %define machines_version 298
# we generally want CentOS packages to be like RHEL; special cases need to check %{centos} explicitly # we generally want CentOS packages to be like RHEL; special cases need to check %{centos} explicitly
%if 0%{?centos} %if 0%{?centos}
@ -51,7 +51,7 @@ Summary: Web Console for Linux servers
License: LGPL-2.1-or-later License: LGPL-2.1-or-later
URL: https://cockpit-project.org/ URL: https://cockpit-project.org/
Version: 299 Version: 300
Release: 1%{?dist} Release: 1%{?dist}
Source0: https://github.com/cockpit-project/cockpit/releases/download/%{version}/cockpit-%{version}.tar.xz 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 Source1: https://github.com/cockpit-project/cockpit-machines/releases/download/%{machines_version}/cockpit-machines-%{machines_version}.tar.xz
@ -293,7 +293,7 @@ for data in doc man pixmaps polkit-1; do
done done
rm -r %{buildroot}/%{_prefix}/%{__lib}/tmpfiles.d rm -r %{buildroot}/%{_prefix}/%{__lib}/tmpfiles.d
find %{buildroot}/%{_unitdir}/ -type f ! -name 'cockpit-session*' -delete 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 for libexec in cockpit-askpass cockpit-beiboot cockpit-session cockpit-ws cockpit-tls cockpit-wsinstance-factory cockpit-client cockpit-client.ui cockpit-desktop cockpit-certificate-helper cockpit-certificate-ensure; do
rm -f %{buildroot}/%{_libexecdir}/$libexec rm -f %{buildroot}/%{_libexecdir}/$libexec
done done
rm -r %{buildroot}/%{_sysconfdir}/pam.d %{buildroot}/%{_sysconfdir}/motd.d %{buildroot}/%{_sysconfdir}/issue.d rm -r %{buildroot}/%{_sysconfdir}/pam.d %{buildroot}/%{_sysconfdir}/motd.d %{buildroot}/%{_sysconfdir}/issue.d
@ -384,6 +384,7 @@ system on behalf of the web based user interface.
%{_libexecdir}/cockpit-askpass %{_libexecdir}/cockpit-askpass
%if %{cockpit_enable_python} %if %{cockpit_enable_python}
%{python3_sitelib}/%{name}* %{python3_sitelib}/%{name}*
%{_libexecdir}/cockpit-beiboot
%endif %endif
%package doc %package doc
@ -818,6 +819,10 @@ via PackageKit.
# The changelog is automatically generated and merged # The changelog is automatically generated and merged
%changelog %changelog
* Wed Sep 06 2023 Martin Pitt <mpitt@redhat.com> - 300-1
- Celebrating the Nürnberg life release!
- Storage: Support for growing block devices of a Stratis pool
* Wed Aug 23 2023 Martin Pitt <mpitt@redhat.com> - 299-1 * Wed Aug 23 2023 Martin Pitt <mpitt@redhat.com> - 299-1
- Storage: Support for no-overprovisioning with Stratis - Storage: Support for no-overprovisioning with Stratis
- Storage: Cockpit can now add caches to encrypted Stratis pools - Storage: Cockpit can now add caches to encrypted Stratis pools

View File

@ -2,7 +2,7 @@ discover:
how: fmf how: fmf
# for machines tests; keep in sync with cockpit-appstream.spec # for machines tests; keep in sync with cockpit-appstream.spec
url: https://github.com/cockpit-project/cockpit-machines url: https://github.com/cockpit-project/cockpit-machines
ref: "297" ref: "298"
execute: execute:
how: tmt how: tmt
@ -11,7 +11,7 @@ execute:
summary: Run Cockpit tests for optional packages summary: Run Cockpit tests for optional packages
discover+: discover+:
url: https://github.com/cockpit-project/cockpit url: https://github.com/cockpit-project/cockpit
ref: "299" ref: "300"
test: /test/browser/optional test: /test/browser/optional
/machines-basic: /machines-basic:

View File

@ -1,2 +1,2 @@
SHA512 (cockpit-299.tar.xz) = c0a7b08007815a4bcc453dfb53c9ed2aded71450cbb8abb87c2eb067b385e14fd4945a651d2e7bd0a52725737a68943ec7d77933370d37fee2c5b95656eb3739 SHA512 (cockpit-300.tar.xz) = 758e50c00ad203d26f2c442b13be43c1df86b32451d8f1e1bf38aab27801407d260d208028ede4f0d44c505dbba590d3429164ada829d580de6a09e67b4ab4fe
SHA512 (cockpit-machines-297.tar.xz) = 78a1fe6e9f82547322f9984e35a6d07de9d1084306f393554fbac8fac75f9aa27f16da7748b0199071e9d544490b7b85f477eb1b5f80346cefed7edc2efed8ff SHA512 (cockpit-machines-298.tar.xz) = e7286c2781f231d48565218aa35fa688ae469dc4495f6571fce1f925e63173b98b58c34be23bf36dcb315c2935fdd6a33a989ce6d8f5b75a806558f284dcf9eb