diff --git a/cockpit-220.tar.xz b/cockpit-220.tar.xz deleted file mode 100644 index 44a1785..0000000 --- a/cockpit-220.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:afc82acc8ef9d51e0f34265a07a2f059f5b71a1df721b299e657a40a098cbb7f -size 13324848 diff --git a/cockpit-222.tar.xz b/cockpit-222.tar.xz new file mode 100644 index 0000000..94fd941 --- /dev/null +++ b/cockpit-222.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d029d5c3db2ab6d04f36dabf16084006106b3ad9f5a3299e9266c03bdb5ba65e +size 15331344 diff --git a/cockpit.changes b/cockpit.changes index 72a3647..7838615 100644 --- a/cockpit.changes +++ b/cockpit.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Fri Jun 26 12:09:09 UTC 2020 - Ludwig Nussel + +- new version 222: + https://cockpit-project.org/blog/cockpit-222.html + changelog from 221: + https://cockpit-project.org/blog/cockpit-221.html +- enable docker module + ------------------------------------------------------------------- Tue Jun 9 12:11:54 UTC 2020 - Ludwig Nussel diff --git a/cockpit.spec b/cockpit.spec index 1205739..cd814d2 100644 --- a/cockpit.spec +++ b/cockpit.spec @@ -76,7 +76,7 @@ Summary: Web Console for Linux servers License: LGPL-2.1-or-later URL: https://cockpit-project.org/ -Version: 220 +Version: 222 %if %{defined wip} Release: 1.%{wip}%{?dist} Source0: cockpit-%{version}.tar.xz @@ -143,7 +143,7 @@ Recommends: cockpit-packagekit Suggests: cockpit-pcp %ifarch x86_64 %{arm} aarch64 ppc64le i686 s390x -%if 0%{?fedora} == 31 && 0%{?build_optional} +%if (0%{?fedora} == 31 || 0%{?suse_version}) && 0%{?build_optional} %define build_docker 1 Recommends: (cockpit-docker if /usr/bin/docker) %endif @@ -186,7 +186,13 @@ exec 2>&1 %define testsuite_fail || true %endif %endif -make -j4 check %{?testsuite_fail} +# HACK: RHEL i686 builders hang after running all tests; not a supported architecture, so don't bother +%if 0%{?rhel} >= 8 +%ifarch i686 +%define testsuite_skip # +%endif +%endif +%{?testsuite_skip} make -j4 check %{?testsuite_fail} %install make install DESTDIR=%{buildroot} @@ -312,6 +318,7 @@ sed -i "s|%{buildroot}||" *.list # the distro. pushd %{buildroot}/%{_datadir}/cockpit/branding find -L * -type l -printf "%H\n" | sort -u | xargs rm -rv +ln -s opensuse-tumbleweed opensuse-microos popd # need this in SUSE as post build checks dislike stale symlinks install -m 644 -D /dev/null %{buildroot}/run/cockpit/motd @@ -731,6 +738,7 @@ The Cockpit components for interacting with Docker and user interface. This package is not yet complete. %files -n cockpit-docker -f docker.list +%dir %{_datadir}/cockpit/docker/images %{_datadir}/metainfo/org.cockpit-project.cockpit-docker.metainfo.xml %endif