diff --git a/.cockpit-appstream.metadata b/.cockpit-appstream.metadata index a71ce5e..149f1f4 100644 --- a/.cockpit-appstream.metadata +++ b/.cockpit-appstream.metadata @@ -1,2 +1,2 @@ -667aea91cc30d7abf45f0f7574ed12109a0e6b54 SOURCES/cockpit-276.tar.xz -4898411d2555d294ca57d887c548b5992811bf51 SOURCES/cockpit-machines-274.tar.xz +e10e1c210ad5ed4b7e7a43231791d7a14092dd66 SOURCES/cockpit-279.tar.xz +04106c5271e0f1edefefcb05fe3a585971283947 SOURCES/cockpit-machines-278.1.tar.xz diff --git a/.gitignore b/.gitignore index ee5eafc..46cb3a0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -SOURCES/cockpit-276.tar.xz -SOURCES/cockpit-machines-274.tar.xz +SOURCES/cockpit-279.tar.xz +SOURCES/cockpit-machines-278.1.tar.xz diff --git a/SPECS/cockpit-appstream.spec b/SPECS/cockpit-appstream.spec index 68b640b..73ad7bb 100644 --- a/SPECS/cockpit-appstream.spec +++ b/SPECS/cockpit-appstream.spec @@ -28,7 +28,7 @@ # we maintain the basic/optional split, then it can be replaced with just %{version}. %define required_base 266 -%define machines_version 274 +%define machines_version 278.1 # we generally want CentOS packages to be like RHEL; special cases need to check %{centos} explicitly %if 0%{?centos} @@ -51,7 +51,7 @@ Summary: Web Console for Linux servers License: LGPLv2+ URL: https://cockpit-project.org/ -Version: 276 +Version: 279 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 @@ -262,7 +262,8 @@ done for libexec in cockpit-askpass cockpit-session cockpit-ws cockpit-tls cockpit-wsinstance-factory cockpit-client cockpit-client.ui 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 +rm -r %{buildroot}/%{_sysconfdir}/pam.d %{buildroot}/%{_sysconfdir}/motd.d %{buildroot}/%{_sysconfdir}/issue.d +rm -f %{buildroot}/%{_libdir}/security/pam_* rm %{buildroot}/usr/bin/cockpit-bridge rm -f %{buildroot}%{_libexecdir}/cockpit-ssh rm -f %{buildroot}%{_datadir}/metainfo/cockpit.appdata.xml @@ -274,7 +275,7 @@ 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 +rm -f %{buildroot}/%{pamdir}/mock-pam-conv-mod.so # files from -pcp rm -r %{buildroot}/%{_libexecdir}/cockpit-pcp %{buildroot}/%{_localstatedir}/lib/pcp/ # files from -storaged @@ -628,7 +629,7 @@ This package contains tests and files used while testing Cockpit. These files are not required for running Cockpit. %files -n cockpit-tests -f tests.list -%{_prefix}/%{__lib}/cockpit-test-assets +%{pamdir}/mock-pam-conv-mod.so %package -n cockpit-machines BuildArch: noarch @@ -693,8 +694,9 @@ via PackageKit. # The changelog is automatically generated and merged %changelog -* Mon Sep 12 2022 Martin Pitt - 276-1 -- Translation updates (rhbz#2062693) +* Wed Nov 23 2022 Matej Marusak - 278-1 +- Machines: Allow TRIM/UNMAP requests by default for newly added disks +- Machines: Insert and eject CD & DVD media * Thu Aug 25 2022 Matej Marusak - 275-1 - Machines: Offer downloading RHEL OS only for RHEL >= 8 (rhbz#2118236)