From 6855b26fd49c3bd1ed1c157ad6ee021c3a24d2f2 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Apr 22 2021 14:11:05 +0000 Subject: import cockpit-appstream-242-1.el8 --- diff --git a/.cockpit-appstream.metadata b/.cockpit-appstream.metadata index 38e602f..4a87ba9 100644 --- a/.cockpit-appstream.metadata +++ b/.cockpit-appstream.metadata @@ -1 +1,2 @@ -c81c4fd63504e87808bc7df1f2d640da8296de6e SOURCES/cockpit-238.2.tar.xz +9c4eaceb65904809ba4ae1e03d71da01febf3053 SOURCES/cockpit-242.tar.xz +d01759da94df9218925297c608196b5c50b0c23b SOURCES/cockpit-machines-243.tar.gz diff --git a/.gitignore b/.gitignore index 009df0a..2c204cd 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -SOURCES/cockpit-238.2.tar.xz +SOURCES/cockpit-242.tar.xz +SOURCES/cockpit-machines-243.tar.gz diff --git a/SPECS/cockpit-appstream.spec b/SPECS/cockpit-appstream.spec index 1981c7f..651cbfd 100644 --- a/SPECS/cockpit-appstream.spec +++ b/SPECS/cockpit-appstream.spec @@ -1,5 +1,5 @@ # This spec file has been automatically updated -Version: 238.2 +Version: 242 Release: 1%{?dist} # # Copyright (C) 2014-2020 Red Hat, Inc. @@ -35,6 +35,8 @@ Release: 1%{?dist} # by tools/gen-spec-dependencies during "make dist", but keep a hardcoded fallback %define required_base 122 +%define machines_version 243 + # we generally want CentOS packages to be like RHEL; special cases need to check %{centos} explicitly %if 0%{?centos} %define rhel %{centos} @@ -44,10 +46,6 @@ Release: 1%{?dist} %define __lib lib -%if 0%{?rhel} -%define vdo_on_demand 1 -%endif - %if 0%{?suse_version} %define pamdir /%{_lib}/security %else @@ -64,10 +62,11 @@ URL: https://cockpit-project.org/ Source0: cockpit-%{version}.tar.xz %else 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.gz %endif # in RHEL 8 the source package is duplicated: cockpit (building basic packages like cockpit-{bridge,system}) -# and cockpit-appstream (building optional packages like cockpit-{machines,pcp}) +# and cockpit-appstream (building optional packages like cockpit-{pcp}) # This split does not apply to EPEL/COPR. # In Fedora ELN/RHEL 9+ there is just one source package, which ships rpms in both BaseOS and AppStream %if 0%{?rhel} == 8 && 0%{?epel} == 0 @@ -150,6 +149,7 @@ Recommends: subscription-manager-cockpit %endif %prep +%setup -q -T -a 1 -c -n cockpit-machines-%{machines_version} %setup -q -n cockpit-%{version} %build @@ -159,8 +159,6 @@ exec 2>&1 --with-cockpit-user=cockpit-ws \ --with-cockpit-ws-instance-user=cockpit-wsinstance \ --with-selinux-config-type=etc_t \ - --with-appstream-data-packages='[ "appstream-data" ]' \ - --with-nfs-client-package='"nfs-utils"' \ %if 0%{?suse_version} --docdir=%_defaultdocdir/%{name} \ %endif @@ -168,7 +166,7 @@ exec 2>&1 %if 0%{?build_basic} == 0 --disable-ssh \ %endif - %{?vdo_on_demand:--with-vdo-package='"vdo"'} + make -j4 %{?extra_flags} all %check @@ -190,6 +188,7 @@ exec 2>&1 %install %make_install make install-tests DESTDIR=%{buildroot} +make -C %{_builddir}/cockpit-machines-%{machines_version}/cockpit-machines install DESTDIR=%{buildroot} mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pam.d install -p -m 644 tools/cockpit.pam $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/cockpit rm -f %{buildroot}/%{_libdir}/cockpit/*.so @@ -270,7 +269,7 @@ done for lib in systemd tmpfiles.d; do rm -r %{buildroot}/%{_prefix}/%{__lib}/$lib done -for libexec in cockpit-askpass cockpit-session cockpit-ws cockpit-tls cockpit-wsinstance-factory cockpit-desktop; do +for libexec in cockpit-askpass cockpit-session cockpit-ws cockpit-tls cockpit-wsinstance-factory cockpit-desktop cockpit-certificate-helper cockpit-certificate-ensure; do rm %{buildroot}/%{_libexecdir}/$libexec done rm -r %{buildroot}/%{_libdir}/security %{buildroot}/%{_sysconfdir}/pam.d %{buildroot}/%{_sysconfdir}/motd.d %{buildroot}/%{_sysconfdir}/issue.d @@ -281,15 +280,13 @@ rm -f %{buildroot}%{_datadir}/metainfo/cockpit.appdata.xml # when not building optional packages, remove their files %if 0%{?build_optional} == 0 -for pkg in apps machines packagekit pcp playground storaged; do +for pkg in apps packagekit pcp playground storaged; do rm -rf %{buildroot}/%{_datadir}/cockpit/$pkg done # files from -tests rm -r %{buildroot}/%{_prefix}/%{__lib}/cockpit-test-assets # files from -pcp rm -r %{buildroot}/%{_libexecdir}/cockpit-pcp %{buildroot}/%{_localstatedir}/lib/pcp/ -# files from -machines -rm -f %{buildroot}/%{_prefix}/share/metainfo/org.cockpit-project.cockpit-machines.metainfo.xml # files from -storaged rm -f %{buildroot}/%{_prefix}/share/metainfo/org.cockpit-project.cockpit-storaged.metainfo.xml %endif @@ -487,6 +484,8 @@ authentication via sssd/FreeIPA. %{_libexecdir}/cockpit-wsinstance-factory %{_libexecdir}/cockpit-tls %{_libexecdir}/cockpit-desktop +%{_libexecdir}/cockpit-certificate-ensure +%{_libexecdir}/cockpit-certificate-helper %attr(4750, root, cockpit-wsinstance) %{_libexecdir}/cockpit-session %{_datadir}/cockpit/branding @@ -498,16 +497,15 @@ getent passwd cockpit-wsinstance >/dev/null || useradd -r -g cockpit-wsinstance %post ws %tmpfiles_create cockpit-tempfiles.conf -%systemd_post cockpit.socket +%systemd_post cockpit.socket cockpit.service # firewalld only partially picks up changes to its services files without this test -f %{_bindir}/firewall-cmd && firewall-cmd --reload --quiet || true %preun ws -%systemd_preun cockpit.socket +%systemd_preun cockpit.socket cockpit.service %postun ws -%systemd_postun_with_restart cockpit.socket -%systemd_postun_with_restart cockpit.service +%systemd_postun_with_restart cockpit.socket cockpit.service # ------------------------------------------------------------------------------- # Sub-packages that are part of cockpit-system in RHEL/CentOS, but separate in Fedora @@ -651,11 +649,11 @@ The Cockpit components for managing virtual machines. If "virt-install" is installed, you can also create new virtual machines. %files -n cockpit-machines -f machines.list -%{_datadir}/metainfo/org.cockpit-project.cockpit-machines.metainfo.xml +%{_datadir}/metainfo/org.cockpit-project.machines.metainfo.xml %package -n cockpit-pcp Summary: Cockpit PCP integration -Requires: cockpit-bridge >= 134.x +Requires: cockpit-bridge >= 238.1.1 Requires(post): pcp %description -n cockpit-pcp @@ -686,8 +684,9 @@ via PackageKit. # The changelog is automatically generated and merged %changelog -* Fri Mar 12 2021 Matej Marusak - 238.2-1 -- Update translations (rhbz#1934958) +* Fri Apr 16 2021 Martin Pitt - 242-1 +- Updates: Show subscription status on cloud images (rhbz#1931429) +- Machines: Allow creation of non-root user for unattended installations (rhbz#1940287) * Mon Feb 22 2021 Martin Pitt - 238.1-1 - Several UI alignment fixes