import cockpit-appstream-275-1.el8

.cockpit-appstream.metadata

@@ -1,2 +1,2 @@
-c408f0050d65f48049f8f3f0ef0ab49e55251988 SOURCES/cockpit-264.tar.xz
+966f5b12e230d08d7ffe35ffbbcf882153454430 SOURCES/cockpit-275.tar.xz
-7e6affcdcf77a84c7411078c6be1ce998274acb2 SOURCES/cockpit-machines-262.tar.xz
+3ea687c846787a99fc1fb28b14f44aba48be90ed SOURCES/cockpit-machines-273.tar.xz

.gitignore

@@ -1,2 +1,2 @@
-SOURCES/cockpit-264.tar.xz
+SOURCES/cockpit-275.tar.xz
-SOURCES/cockpit-machines-262.tar.xz
+SOURCES/cockpit-machines-273.tar.xz

SPECS/cockpit-appstream.spec

@@ -1,6 +1,3 @@
-# This spec file has been automatically updated
-Version:        264
-Release: 1%{?dist}
 #
 # Copyright (C) 2014-2020 Red Hat, Inc.
 #
@@ -27,11 +24,11 @@ Release: 1%{?dist}
 # Check first cockpit-devel@lists.fedorahosted.org
 #
 
-# earliest base that the subpackages work on; the instances of this get computed/updated
+# earliest base that the subpackages work on; this is still required as long as
-# by tools/gen-spec-dependencies during "make dist", but keep a hardcoded fallback
+# we maintain the basic/optional split, then it can be replaced with just %{version}.
-%define required_base 122
+%define required_base 266
 
-%define machines_version 262
+%define machines_version 273
 
 # we generally want CentOS packages to be like RHEL; special cases need to check %{centos} explicitly
 %if 0%{?centos}
@@ -54,16 +51,18 @@ Summary:        Web Console for Linux servers
 License:        LGPLv2+
 URL:            https://cockpit-project.org/
 
+Version:        275
+Release:        1%{?dist}
 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
 
 # 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})
-# This split does not apply to EPEL/COPR.
+# This split does not apply to EPEL/COPR nor packit c8s builds, only to our own
+# image-prepare rhel-8-Y builds (which will disable build_all).
 # In Fedora ELN/RHEL 9+ there is just one source package, which ships rpms in both BaseOS and AppStream
-# We also provide an override mechanism if you want to build all packages.
 %define build_all 0
-%if 0%{?rhel} == 8 && 0%{?epel} == 0 && !%{build_all}
+%if 0%{?rhel} == 8 && 0%{?epel} == 0 && !0%{?build_all}
 
 %if "%{name}" == "cockpit"
 %define build_basic 1
@@ -93,7 +92,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
@@ -148,7 +153,7 @@ Recommends: (cockpit-networkmanager if NetworkManager)
 Suggests: cockpit-selinux
 %endif
 %if 0%{?rhel} && 0%{?centos} == 0
-Recommends: subscription-manager-cockpit
+Requires: subscription-manager-cockpit
 %endif
 
 %prep
@@ -171,20 +176,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
@@ -195,16 +187,10 @@ install -p -m 644 tools/cockpit.pam $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/cockpit
 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
-    ln -s cockpit.css.gz %{buildroot}/%{_datadir}/cockpit/base1/patternfly.css.gz
-%endif
-
 # Build the package lists for resource packages
 # cockpit-bridge is the basic dependency for all cockpit-* packages, so centrally own the page directory
 echo '%dir %{_datadir}/cockpit' > base.list
 echo '%dir %{_datadir}/cockpit/base1' >> base.list
-echo '%dir %{_datadir}/cockpit/base1/fonts' >> base.list
 find %{buildroot}%{_datadir}/cockpit/base1 -type f -o -type l >> base.list
 echo '%{_sysconfdir}/cockpit/machines.d' >> base.list
 echo %{buildroot}%{_datadir}/polkit-1/actions/org.cockpit-project.cockpit-bridge.policy >> base.list
@@ -267,7 +253,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
@@ -297,13 +283,7 @@ rm -f %{buildroot}/%{_prefix}/share/metainfo/org.cockpit-project.cockpit-storage
 
 sed -i "s|%{buildroot}||" *.list
 
-%if 0%{?suse_version}
+%if ! 0%{?suse_version}
-# remove brandings with stale symlinks. Means they don't match
-# the distro.
-pushd %{buildroot}/%{_datadir}/cockpit/branding
-find -L * -type l -printf "%H\n" | sort -u | xargs rm -rv
-popd
-%else
 %global _debugsource_packages 1
 %global _debuginfo_subpackages 0
 
@@ -322,10 +302,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
 
@@ -401,23 +377,21 @@ Provides: cockpit-tuned = %{version}-%{release}
 Provides: cockpit-users = %{version}-%{release}
 Obsoletes: cockpit-dashboard < %{version}-%{release}
 %if 0%{?rhel}
-Provides: cockpit-networkmanager = %{version}-%{release}
 Requires: NetworkManager >= 1.6
-Provides: cockpit-kdump = %{version}-%{release}
 Requires: kexec-tools
-Recommends: (sudo or polkit)
+Requires: sos
+Requires: sudo
 Recommends: PackageKit
-Recommends: NetworkManager-team
 Recommends: setroubleshoot-server >= 3.3.3
+Suggests: NetworkManager-team
+Provides: cockpit-kdump = %{version}-%{release}
+Provides: cockpit-networkmanager = %{version}-%{release}
 Provides: cockpit-selinux = %{version}-%{release}
 Provides: cockpit-sosreport = %{version}-%{release}
-Requires: sos
 %endif
 %if 0%{?fedora}
 Recommends: (reportd if abrt)
 %endif
-# NPM modules which are also available as packages
-Provides: bundled(xstatic-patternfly-common) = 3.59.5
 
 %description system
 This package contains the Cockpit shell and system configuration interfaces.
@@ -448,7 +422,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
@@ -544,8 +518,8 @@ fi
 
 %package kdump
 Summary: Cockpit user interface for kernel crash dumping
-Requires: cockpit-bridge >= 122
+Requires: cockpit-bridge >= %{required_base}
-Requires: cockpit-shell >= 122
+Requires: cockpit-shell >= %{required_base}
 Requires: kexec-tools
 BuildArch: noarch
 
@@ -557,8 +531,8 @@ The Cockpit component for configuring kernel crash dumping.
 
 %package sosreport
 Summary: Cockpit user interface for diagnostic reports
-Requires: cockpit-bridge >= 122
+Requires: cockpit-bridge >= %{required_base}
-Requires: cockpit-shell >= 122
+Requires: cockpit-shell >= %{required_base}
 Requires: sos
 BuildArch: noarch
 
@@ -572,8 +546,8 @@ sosreport tool.
 
 %package networkmanager
 Summary: Cockpit user interface for networking, using NetworkManager
-Requires: cockpit-bridge >= 186
+Requires: cockpit-bridge >= %{required_base}
-Requires: cockpit-shell >= 186
+Requires: cockpit-shell >= %{required_base}
 Requires: NetworkManager >= 1.6
 # Optional components
 Recommends: NetworkManager-team
@@ -590,8 +564,8 @@ The Cockpit component for managing networking.  This package uses NetworkManager
 
 %package selinux
 Summary: Cockpit SELinux package
-Requires: cockpit-bridge >= 122
+Requires: cockpit-bridge >= %{required_base}
-Requires: cockpit-shell >= 122
+Requires: cockpit-shell >= %{required_base}
 Requires: setroubleshoot-server >= 3.3.3
 BuildArch: noarch
 
@@ -621,10 +595,10 @@ 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: cockpit-shell >= %{required_base}
-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 +633,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.
@@ -683,7 +660,7 @@ If "virt-install" is installed, you can also create new virtual machines.
 
 %package -n cockpit-pcp
 Summary: Cockpit PCP integration
-Requires: cockpit-bridge >= 238.1.1
+Requires: cockpit-bridge >= %{required_base}
 Requires: pcp
 
 %description -n cockpit-pcp
@@ -699,7 +676,7 @@ systemctl reload-or-try-restart pmlogger
 %package -n cockpit-packagekit
 Summary: Cockpit user interface for packages
 BuildArch: noarch
-Requires: cockpit-bridge >= 186
+Requires: cockpit-bridge >= %{required_base}
 Requires: PackageKit
 Recommends: python3-tracer
 # HACK: https://bugzilla.redhat.com/show_bug.cgi?id=1800468
@@ -716,6 +693,27 @@ via PackageKit.
 
 # The changelog is automatically generated and merged
 %changelog
+* Thu Aug 25 2022 Matej Marusak <mmarusak@redhat.com> - 275-1
+- Machines: Offer downloading RHEL OS only for RHEL >= 8 (rhbz#2118236)
+
+* Thu Jul 21 2022 Martin Pitt <mpitt@redhat.com> - 273-1
+ - Software Updates: Optionally reboot after updating
+ - Machines: Show toast notication if VM's storage deletion fails (rhbz#2105984)
+
+* Thu Jun 23 2022 Matej Marusak <mmarusak@redhat.com> - 272-1
+- Translation updates
+
+* Wed May 25 2022 Martin Pitt <mpitt@redhat.com> - 270-1
+- Machines: Redesign content removal dialogs
+
+* Mon May 16 2022 Martin Pitt <mpitt@redhat.com> - 269-1
+- 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
 - Translation updates
@@ -758,7 +756,7 @@ via PackageKit.
 - Machines: Use cockpit's proxy API for monitoring libvirt service changes (rhbz#1974223)
 - Machines: Fix ooops when press the down arrow several times when inputting custom path (rhbz#1977554)
 
-* Thu Jul 09 2021 Katerina Koukiou <kkoukiou@redhat.com> - 248-1
+* Fri Jul 09 2021 Katerina Koukiou <kkoukiou@redhat.com> - 248-1
 - Machines: Share host files with the guest using virtiofs
 - Machines: Show list of pass-through devices
 
@@ -778,7 +776,7 @@ via PackageKit.
 - Several UI alignment fixes
 - Updates: Show PackageKit errors properly
 
-* Thu Feb 19 2021 Katerina Koukiou <kkoukiou@redhat.com> - 238-1
+* Fri Feb 19 2021 Katerina Koukiou <kkoukiou@redhat.com> - 238-1
 - machines: VM disk creation supports a custom path
 - Updates: List outdated software that needs a restart