From dd8bf4d3bbdbccad1c58f61531a371070a3d8b33 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Jul 14 2020 01:10:56 +0000 Subject: import cockpit-appstream-222.1-1.el8 --- diff --git a/.cockpit-appstream.metadata b/.cockpit-appstream.metadata index 5d051db..7e2e2e5 100644 --- a/.cockpit-appstream.metadata +++ b/.cockpit-appstream.metadata @@ -1 +1 @@ -602cf4d82e837cf2d3b45041befecd6e4e22d40d SOURCES/cockpit-220.tar.xz +dfb45151b16145a9b9fae12fb30dc2cd4370852e SOURCES/cockpit-222.1.tar.xz diff --git a/.gitignore b/.gitignore index 2f48afb..9551321 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/cockpit-220.tar.xz +SOURCES/cockpit-222.1.tar.xz diff --git a/SPECS/cockpit-appstream.spec b/SPECS/cockpit-appstream.spec index efe2640..d77f6f7 100644 --- a/SPECS/cockpit-appstream.spec +++ b/SPECS/cockpit-appstream.spec @@ -1,5 +1,5 @@ # This spec file has been automatically updated -Version: 220 +Version: 222.1 Release: 1%{?dist} # # This file is maintained at the following location: @@ -165,7 +165,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} @@ -720,6 +726,17 @@ via PackageKit. # The changelog is automatically generated and merged %changelog +* Fri Jun 26 2020 Matej Marusak - 222.1-1 +- Some integration test fixes for dist-git gating + +* Wed Jun 24 2020 Matej Marusak - 222-1 +- Localization updates + +* Sun Jun 14 2020 Martin Pitt - 221-1 +- machines: Remove --noreboot parameter to virt-install for VM installation + (rhbz#1750637) +- Translation updates + * Thu May 28 2020 Matej Marusak - 220-1 - Storage: Improve side panel on details page