import cockpit-appstream-269-1.el8

.cockpit-appstream.metadata

@@ -1,2 +1,2 @@
-bdc1568b2e05f52c14c626b1f22a089914b9b883 SOURCES/cockpit-264.1.tar.xz
+3cdd47cf4dd1803535a120b3e40a9a4dc781055b SOURCES/cockpit-269.tar.xz
-87ed0eeda8d77242dba1e3d4104e17b07904371a SOURCES/cockpit-machines-263.tar.xz
+666fc5f93f82e5f50374cf0a23772a564331dbd1 SOURCES/cockpit-machines-268.tar.xz

.gitignore

@@ -1,2 +1,2 @@
-SOURCES/cockpit-264.1.tar.xz
+SOURCES/cockpit-269.tar.xz
-SOURCES/cockpit-machines-263.tar.xz
+SOURCES/cockpit-machines-268.tar.xz

SPECS/cockpit-appstream.spec

@@ -1,5 +1,5 @@
 # This spec file has been automatically updated
-Version:        264.1
+Version:        269
 Release: 1%{?dist}
 #
 # Copyright (C) 2014-2020 Red Hat, Inc.
@@ -31,7 +31,7 @@ Release: 1%{?dist}
 # by tools/gen-spec-dependencies during "make dist", but keep a hardcoded fallback
 %define required_base 122
 
-%define machines_version 263
+%define machines_version 268
 
 # we generally want CentOS packages to be like RHEL; special cases need to check %{centos} explicitly
 %if 0%{?centos}
@@ -93,7 +93,13 @@ BuildRequires: pam-devel
 BuildRequires: autoconf automake
 BuildRequires: make
 BuildRequires: /usr/bin/python3
+%if 0%{?rhel} && 0%{?rhel} <= 8
+# RHEL 8's gettext does not yet have metainfo.its
 BuildRequires: gettext >= 0.19.7
+BuildRequires: libappstream-glib-devel
+%else
+BuildRequires: gettext >= 0.21
+%endif
 %if 0%{?build_basic}
 BuildRequires: libssh-devel >= 0.8.5
 %endif
@@ -171,20 +177,7 @@ Recommends: subscription-manager-cockpit
 %make_build
 
 %check
-exec 2>&1
+make -j$(nproc) check
-# HACK: Fedora koji builders are very slow, unreliable, and inaccessible for debugging; https://github.com/cockpit-project/cockpit/issues/13909
-%if 0%{?fedora} >= 0
-%ifarch s390x
-%define testsuite_fail || true
-%endif
-%endif
-# 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
@@ -196,8 +189,15 @@ rm -f %{buildroot}/%{_libdir}/cockpit/*.so
 install -D -p -m 644 AUTHORS COPYING README.md %{buildroot}%{_docdir}/cockpit/
 
 # only ship deprecated PatternFly API for stable releases
-%if 0%{?rhel} <= 8
+%if 0%{?rhel} == 8
+    if [ -f %{buildroot}/%{_datadir}/cockpit/base1/cockpit.css.gz ]; then
         ln -s cockpit.css.gz %{buildroot}/%{_datadir}/cockpit/base1/patternfly.css.gz
+    elif [ -f %{buildroot}/%{_datadir}/cockpit/base1/cockpit.css ]; then
+        ln -s cockpit.css %{buildroot}/%{_datadir}/cockpit/base1/patternfly.css
+    else
+        echo >&2 Neither cockpit.css.gz nor cockpit.css exists.
+        exit 1
+    fi
 %endif
 
 # Build the package lists for resource packages
@@ -267,7 +267,7 @@ for pkg in base1 branding motd kdump networkmanager selinux shell sosreport ssh
     rm -r %{buildroot}/%{_datadir}/cockpit/$pkg
     rm -f %{buildroot}/%{_datadir}/metainfo/org.cockpit-project.cockpit-${pkg}.metainfo.xml
 done
-for data in doc locale man pixmaps polkit-1; do
+for data in doc man pixmaps polkit-1; do
     rm -r %{buildroot}/%{_datadir}/$data
 done
 for lib in systemd tmpfiles.d; do
@@ -322,10 +322,6 @@ rm -f %{buildroot}%{_datadir}/metainfo/org.cockpit-project.cockpit-selinux.metai
 rm -f %{buildroot}%{_datadir}/pixmaps/cockpit-sosreport.png
 %endif
 
-%if 0%{?build_basic}
-%find_lang cockpit
-%endif
-
 # -------------------------------------------------------------------------------
 # Basic Sub-packages
 
@@ -448,7 +444,7 @@ The Cockpit Web Service listens on the network, and authenticates users.
 If sssd-dbus is installed, you can enable client certificate/smart card
 authentication via sssd/FreeIPA.
 
-%files ws -f cockpit.lang -f static.list
+%files ws -f static.list
 %doc %{_mandir}/man1/cockpit-desktop.1.gz
 %doc %{_mandir}/man5/cockpit.conf.5.gz
 %doc %{_mandir}/man8/cockpit-ws.8.gz
@@ -622,9 +618,9 @@ Dummy package from building optional packages only; never install or publish me.
 %package -n cockpit-storaged
 Summary: Cockpit user interface for storage, using udisks
 Requires: cockpit-shell >= 186
-Requires: udisks2 >= 2.6
+Requires: udisks2 >= 2.9
-Recommends: udisks2-lvm2 >= 2.6
+Recommends: udisks2-lvm2 >= 2.9
-Recommends: udisks2-iscsi >= 2.6
+Recommends: udisks2-iscsi >= 2.9
 Recommends: device-mapper-multipath
 Recommends: clevis-luks
 Requires: %{__python3}
@@ -659,19 +655,22 @@ These files are not required for running Cockpit.
 %package -n cockpit-machines
 BuildArch: noarch
 Summary: Cockpit user interface for virtual machines
-Requires: cockpit-bridge >= 186
+Requires: cockpit-bridge >= 215
-Requires: cockpit-system >= 186
+Requires: libvirt-daemon-driver-qemu
-%if 0%{?suse_version}
+Requires: libvirt-daemon-driver-network
-Requires: libvirt-daemon-qemu
+Requires: libvirt-daemon-driver-nodedev
-%else
+Requires: libvirt-daemon-driver-storage-core
-Requires: libvirt-daemon-kvm
+Requires: (libvirt-daemon-driver-interface if virt-install)
-%endif
+Requires: (libvirt-daemon-config-network if virt-install)
+Recommends: libvirt-daemon-driver-storage-disk
+Requires: qemu-kvm
 Requires: libvirt-client
 Requires: libvirt-dbus >= 1.2.0
 # Optional components
-Recommends: virt-install
+Recommends: virt-install >= 3.0.0
 Recommends: libosinfo
 Recommends: python3-gobject-base
+Suggests: qemu-virtiofsd
 
 %description -n cockpit-machines
 The Cockpit components for managing virtual machines.
@@ -716,8 +715,13 @@ via PackageKit.
 
 # The changelog is automatically generated and merged
 %changelog
-* Thu Mar 03 2022 Martin Pitt <mpitt@redhat.com> - 264.1-1
+* Mon May 16 2022 Martin Pitt <mpitt@redhat.com> - 269-1
-- Translation updates (rhbz#2060292)
+- Show base-10 units by default (rhbz#1970119)
+- Apps: Fix i18n (rhbz#2018389)
+- Software Updates: Install kpatches only (rhbz#2039989)
+- Machines: Fix deleting net interfaces with non-unique MAC address (rhbz#1867478)
+- Machines: Create disks with random/customizable serial number (rhbz#2036330)
+- Machines: Fix network interface source icon (rhbz#2063680)
 
 * Fri Feb 25 2022 Martin Pitt <mpitt@redhat.com> - 264-1
 - Machines: Fix broken VM deletion dialog layout