Update to cockpit 310.3 upstream release
cockpit half of translation updates. Related: jira#RHEL-14230
This commit is contained in:
parent
12498c121a
commit
b21a269b8d
@ -51,16 +51,11 @@ 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: 310
|
Version: 310.3
|
||||||
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
|
||||||
|
|
||||||
# Don't change the bridge in the RHEL 8; the old SSH breaks some features, see @todoPybridgeRHEL8
|
|
||||||
%if 0%{?rhel} == 8 && !%{defined enable_old_bridge}
|
|
||||||
%define enable_old_bridge 1
|
|
||||||
%endif
|
|
||||||
|
|
||||||
# in RHEL 8 the source package is duplicated: cockpit (building basic packages like cockpit-{bridge,system})
|
# 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})
|
# 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
|
# This split does not apply to EPEL/COPR nor packit c8s builds, only to our own
|
||||||
@ -182,20 +177,6 @@ Suggests: cockpit-selinux
|
|||||||
Requires: subscription-manager-cockpit
|
Requires: subscription-manager-cockpit
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%if 0%{?enable_old_bridge} == 0
|
|
||||||
BuildRequires: python3-devel
|
|
||||||
BuildRequires: python3-pip
|
|
||||||
%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
|
%prep
|
||||||
%setup -q -T -a 1 -c -n cockpit-machines-%{machines_version}
|
%setup -q -T -a 1 -c -n cockpit-machines-%{machines_version}
|
||||||
%setup -q -n cockpit-%{version}
|
%setup -q -n cockpit-%{version}
|
||||||
@ -209,9 +190,6 @@ BuildRequires: python3-tox-current-env
|
|||||||
--docdir=%_defaultdocdir/%{name} \
|
--docdir=%_defaultdocdir/%{name} \
|
||||||
%endif
|
%endif
|
||||||
--with-pamdir='%{pamdir}' \
|
--with-pamdir='%{pamdir}' \
|
||||||
%if 0%{?enable_old_bridge}
|
|
||||||
--enable-old-bridge \
|
|
||||||
%endif
|
|
||||||
%if 0%{?build_basic} == 0
|
%if 0%{?build_basic} == 0
|
||||||
--disable-ssh \
|
--disable-ssh \
|
||||||
%endif
|
%endif
|
||||||
@ -224,10 +202,6 @@ BuildRequires: python3-tox-current-env
|
|||||||
%check
|
%check
|
||||||
make -j$(nproc) check
|
make -j$(nproc) check
|
||||||
|
|
||||||
%if 0%{?enable_old_bridge} == 0 && 0%{?rhel} == 0
|
|
||||||
%tox
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%install
|
%install
|
||||||
%make_install
|
%make_install
|
||||||
make install-tests DESTDIR=%{buildroot}
|
make install-tests DESTDIR=%{buildroot}
|
||||||
@ -244,7 +218,7 @@ echo '%dir %{_datadir}/cockpit/base1' >> base.list
|
|||||||
find %{buildroot}%{_datadir}/cockpit/base1 -type f -o -type l >> base.list
|
find %{buildroot}%{_datadir}/cockpit/base1 -type f -o -type l >> base.list
|
||||||
echo '%{_sysconfdir}/cockpit/machines.d' >> base.list
|
echo '%{_sysconfdir}/cockpit/machines.d' >> base.list
|
||||||
echo %{buildroot}%{_datadir}/polkit-1/actions/org.cockpit-project.cockpit-bridge.policy >> base.list
|
echo %{buildroot}%{_datadir}/polkit-1/actions/org.cockpit-project.cockpit-bridge.policy >> base.list
|
||||||
%if 0%{?enable_old_bridge} && 0%{?build_basic}
|
%if 0%{?build_basic}
|
||||||
echo '%dir %{_datadir}/cockpit/ssh' >> base.list
|
echo '%dir %{_datadir}/cockpit/ssh' >> base.list
|
||||||
find %{buildroot}%{_datadir}/cockpit/ssh -type f >> base.list
|
find %{buildroot}%{_datadir}/cockpit/ssh -type f >> base.list
|
||||||
%endif
|
%endif
|
||||||
@ -398,9 +372,6 @@ system on behalf of the web based user interface.
|
|||||||
%doc %{_mandir}/man1/cockpit-bridge.1.gz
|
%doc %{_mandir}/man1/cockpit-bridge.1.gz
|
||||||
%{_bindir}/cockpit-bridge
|
%{_bindir}/cockpit-bridge
|
||||||
%{_libexecdir}/cockpit-askpass
|
%{_libexecdir}/cockpit-askpass
|
||||||
%if 0%{?enable_old_bridge} == 0
|
|
||||||
%{python3_sitelib}/%{name}*
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%package doc
|
%package doc
|
||||||
Summary: Cockpit deployment and developer guide
|
Summary: Cockpit deployment and developer guide
|
||||||
@ -848,6 +819,10 @@ via PackageKit.
|
|||||||
|
|
||||||
# The changelog is automatically generated and merged
|
# The changelog is automatically generated and merged
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Feb 15 2024 Martin Pitt <mpitt@redhat.com> - 310.3-1
|
||||||
|
- Translation updates (jira#RHEL-16681)
|
||||||
|
Lots of bug fixes
|
||||||
|
|
||||||
* Wed Jan 31 2024 Martin Pitt <mpitt@redhat.com> - 310-1
|
* Wed Jan 31 2024 Martin Pitt <mpitt@redhat.com> - 310-1
|
||||||
- Storage: support for btrfs
|
- Storage: support for btrfs
|
||||||
- Storage: improved support for swap
|
- Storage: improved support for swap
|
||||||
|
@ -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: "310"
|
ref: "310.3"
|
||||||
test: /test/browser/optional
|
test: /test/browser/optional
|
||||||
|
|
||||||
/machines-basic:
|
/machines-basic:
|
||||||
|
2
sources
2
sources
@ -1,2 +1,2 @@
|
|||||||
SHA512 (cockpit-310.tar.xz) = 295dc948608af1d172fbb4721697c1b3d21e3d710fba04b8c23a2833b6dd556ace9edb630397b218a45ce4895d016c81e4fa670cbd09aa911470ab373d485b60
|
SHA512 (cockpit-310.3.tar.xz) = 876f707eb9d9d49503f15b567d6579c144430b6825718e7492a1b3218ffa88e0d1058172d6b27729a7a8024210d78b03e23862069bc025df9904468929fcf57a
|
||||||
SHA512 (cockpit-machines-306.tar.xz) = d2795425ebb857d07b3434fa7bb1762a2b456291080a91da453f3f9f81838cf15c39697aa13078e7411abe79fd02a5e94830ec60517e25bafa1f74e6783a54ee
|
SHA512 (cockpit-machines-306.tar.xz) = d2795425ebb857d07b3434fa7bb1762a2b456291080a91da453f3f9f81838cf15c39697aa13078e7411abe79fd02a5e94830ec60517e25bafa1f74e6783a54ee
|
||||||
|
Loading…
Reference in New Issue
Block a user