rpms/cockpit
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Merged update from upstream sources

Browse Source 
This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/cockpit.git#f36bdd359ddb12c7c54ae50033c915683edb15cc
This commit is contained in:
DistroBaker 2020-12-21 02:31:23 +00:00
parent b84c189809
commit 0946428ae9
3 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -194,3 +194,4 @@
/cockpit-232.tar.xz
/cockpit-233.tar.xz
/cockpit-233.1.tar.xz
/cockpit-234.tar.xz

36
cockpit.spec
View File

@ -1,5 +1,5 @@
# This spec file has been automatically updated
Version: 233.1
Version: 234
Release: 1%{?dist}
#
# Copyright (C) 2014-2020 Red Hat, Inc.
@ -68,7 +68,8 @@ Source0: https://github.com/cockpit-project/cockpit/releases/download/%{v
# in RHEL the source package is duplicated: cockpit (building basic packages like cockpit-{bridge,system})
# and cockpit-appstream (building optional packages like cockpit-{machines,pcp})
%if 0%{?rhel}
# This split does not apply to EPEL/COPR.
%if 0%{?rhel} && 0%{?epel} == 0
%if "%{name}" == "cockpit"
%define build_basic 1
@ -208,9 +209,6 @@ echo '%dir %{_datadir}/cockpit/ssh' >> base.list
find %{buildroot}%{_datadir}/cockpit/ssh -type f >> base.list
echo '%{_libexecdir}/cockpit-ssh' >> base.list
echo '%dir %{_datadir}/cockpit/dashboard' >> dashboard.list
find %{buildroot}%{_datadir}/cockpit/dashboard -type f >> dashboard.list
echo '%dir %{_datadir}/cockpit/pcp' >> pcp.list
find %{buildroot}%{_datadir}/cockpit/pcp -type f >> pcp.list
@ -280,7 +278,7 @@ 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 dashboard machines packagekit pcp playground storaged; do
for pkg in apps machines packagekit pcp playground storaged; do
rm -rf %{buildroot}/%{_datadir}/cockpit/$pkg %{buildroot}/usr/src/debug/%{_datadir}/cockpit/$pkg
done
# files from -tests
@ -364,10 +362,15 @@ troubleshooting, interactive command-line sessions, and more.
Summary: Cockpit bridge server-side component
Requires: glib-networking
Provides: cockpit-ssh = %{version}-%{release}
# cockpit-ssh moved from dashboard to bridge in 171
Conflicts: cockpit-dashboard < 170.x
# PR #10430 dropped workaround for ws' inability to understand x-host-key challenge
Conflicts: cockpit-ws < 181.x
# 233 dropped jquery.js, pages started to bundle it (commit 049e8b8dce)
Conflicts: cockpit-dashboard < 233
Conflicts: cockpit-networkmanager < 233
Conflicts: cockpit-storaged < 233
Conflicts: cockpit-system < 233
Conflicts: cockpit-tests < 233
Conflicts: cockpit-docker < 233
%description bridge
The Cockpit bridge component installed server side and runs commands on the
@ -420,6 +423,7 @@ Recommends: setroubleshoot-server >= 3.3.3
Provides: cockpit-selinux = %{version}-%{release}
Provides: cockpit-sosreport = %{version}-%{release}
Requires: sos
Obsoletes: cockpit-dashboard
%endif
%if 0%{?fedora} >= 29
# 0.7.0 (actually) supports task cancellation.
@ -675,17 +679,6 @@ Cockpit support for reading PCP metrics and loading PCP archives.
%post -n cockpit-pcp
systemctl reload-or-try-restart pmlogger
%package -n cockpit-dashboard
Summary: Cockpit remote server dashboard
BuildArch: noarch
Requires: cockpit-ssh >= 135
Conflicts: cockpit-ws < 135
%description -n cockpit-dashboard
Cockpit page for showing performance graphs for up to 20 remote servers.
%files -n cockpit-dashboard -f dashboard.list
%package -n cockpit-packagekit
Summary: Cockpit user interface for packages
BuildArch: noarch
@ -703,6 +696,11 @@ via PackageKit.
# The changelog is automatically generated and merged
%changelog
* Wed Dec 09 2020 Marius Vollmer <mvollmer@redhat.com> - 234-1
- machines: Allow editing VM's CPU mode and model
- machines: Add support for cloning VMs
- dashboard: So long
* Thu Nov 26 2020 Katerina Koukiou <kkoukiou@redhat.com> - 233.1-1
- Machines: Fix CSS regression on the VMs details page

2
sources
View File

@ -1 +1 @@
SHA512 (cockpit-233.1.tar.xz) = 941ef6916901c34a1a427e45993b3f53c49e95c52e4b6d4f7c1781e3e59ad27f863d379778b3b4ddd1ca22b5d3641d0650e8c9a98bfd3b283c6c7dfe92d6b9ae
SHA512 (cockpit-234.tar.xz) = 2bb0cd547972262d26f57d8262d5eedfa6362d8a27b7f5e994e95c895a7197c536b4e428ab9d78ab78800aace8d63221ac2fa6d22282301a1e28bc59808254ff