From ff02a7c7e5ae0a4c755e171d88488d0d799daf51 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Sat, 14 Jan 2023 08:10:36 +0000 Subject: [PATCH] import cockpit-appstream-283-1.el8 --- .cockpit-appstream.metadata | 4 ++-- .gitignore | 4 ++-- SPECS/cockpit-appstream.spec | 17 ++++++++++++----- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/.cockpit-appstream.metadata b/.cockpit-appstream.metadata index 437b7f3..4f3b7d3 100644 --- a/.cockpit-appstream.metadata +++ b/.cockpit-appstream.metadata @@ -1,2 +1,2 @@ -7faf98fd77271fc75fe8fb3ddc8a91a4eaea552f SOURCES/cockpit-282.1.tar.xz -be25a35fd8546bb9ad1daacc864e6a29f6da4c3d SOURCES/cockpit-machines-280.tar.xz +0cf4b6630c50c629f93cac26c1c2a57c42e0d1ae SOURCES/cockpit-283.tar.xz +2b2076064a21f5b11934e1d0dfe060e9296438fa SOURCES/cockpit-machines-281.tar.xz diff --git a/.gitignore b/.gitignore index 6aca24d..d29a523 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -SOURCES/cockpit-282.1.tar.xz -SOURCES/cockpit-machines-280.tar.xz +SOURCES/cockpit-283.tar.xz +SOURCES/cockpit-machines-281.tar.xz diff --git a/SPECS/cockpit-appstream.spec b/SPECS/cockpit-appstream.spec index dc84772..a2025a4 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 280 +%define machines_version 281 # 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: 282.1 +Version: 283 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 @@ -263,9 +263,8 @@ done for data in doc man pixmaps polkit-1; do rm -r %{buildroot}/%{_datadir}/$data done -for lib in systemd tmpfiles.d; do - rm -r %{buildroot}/%{_prefix}/%{__lib}/$lib -done +rm -r %{buildroot}/%{_prefix}/%{__lib}/tmpfiles.d +find %{buildroot}/%{_unitdir}/ -type f ! -name 'cockpit-session*' -delete 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 @@ -283,6 +282,8 @@ for pkg in apps packagekit pcp playground storaged; do done # files from -tests rm -f %{buildroot}/%{pamdir}/mock-pam-conv-mod.so +rm -f %{buildroot}/%{_unitdir}/cockpit-session.socket +rm -f %{buildroot}/%{_unitdir}/cockpit-session@.service # files from -pcp rm -r %{buildroot}/%{_libexecdir}/cockpit-pcp %{buildroot}/%{_localstatedir}/lib/pcp/ # files from -storaged @@ -642,6 +643,8 @@ These files are not required for running Cockpit. %files -n cockpit-tests -f tests.list %{pamdir}/mock-pam-conv-mod.so +%{_unitdir}/cockpit-session.socket +%{_unitdir}/cockpit-session@.service %package -n cockpit-machines BuildArch: noarch @@ -706,6 +709,10 @@ via PackageKit. # The changelog is automatically generated and merged %changelog +* Wed Jan 11 2023 Katerina Koukiou - 283-1 +- Machines: Summarize system and user session differences +- Machines: Virtual watchdog device support + * 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