From db0a28801f46a72f22fdbe4552566051601f846a Mon Sep 17 00:00:00 2001 From: Cockpit Project Date: Thu, 4 Oct 2018 13:24:49 +0000 Subject: [PATCH] Update to 179-1 - Machines: Detach disk from VM with LibvirtDBus provider - Machines: Offer cockpit-machines as Application --- .gitignore | 1 + cockpit.spec | 19 ++++++++++++++----- sources | 2 +- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 620f873..a3a323f 100644 --- a/.gitignore +++ b/.gitignore @@ -136,3 +136,4 @@ /cockpit-175.tar.xz /cockpit-177.tar.xz /cockpit-178.tar.xz +/cockpit-179.tar.xz diff --git a/cockpit.spec b/cockpit.spec index d797897..5090d45 100644 --- a/cockpit.spec +++ b/cockpit.spec @@ -1,5 +1,5 @@ # This spec file has been automatically updated -Version: 178 +Version: 179 Release: 1%{?dist} # # This file is maintained at the following location: @@ -24,6 +24,10 @@ Release: 1%{?dist} %define rhel %{centos} %endif +%if "%{!?__python3:1}" +%define __python3 /usr/bin/python3 +%endif + # for testing this already gets set in fedora.install, as we want the target # VERSION_ID, not the mock chroot's one %if "%{!?os_version_id:1}" @@ -55,8 +59,8 @@ Release: 1%{?dist} %define build_subscriptions 1 %endif -# cockpit-kubernetes is RHEL 7 only, and 64 bit arches only -%if 0%{?fedora} || (0%{?rhel} >= 7 && 0%{?rhel} < 8) +# cockpit-kubernetes is RHEL 7 and Fedora < 30 only, and 64 bit arches only +%if (0%{?fedora} && 0%{?fedora} < 30) || (0%{?rhel} >= 7 && 0%{?rhel} < 8) %ifarch aarch64 x86_64 ppc64le s390x %define build_kubernetes 1 %endif @@ -638,7 +642,7 @@ Recommends: udisks2-lvm2 >= 2.6 Recommends: udisks2-iscsi >= 2.6 Recommends: device-mapper-multipath Recommends: clevis-luks -Requires: python3 +Requires: %{__python3} Requires: python3-dbus %endif BuildArch: noarch @@ -687,6 +691,7 @@ 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 %package -n cockpit-machines-ovirt BuildArch: noarch @@ -750,7 +755,7 @@ Requires: cockpit-shell >= 122 Requires: /usr/bin/docker Requires: /usr/lib/systemd/system/docker.service %if 0%{?fedora} -Requires: python3 +Requires: %{__python3} %else Requires: python2 %endif @@ -806,6 +811,10 @@ via PackageKit. # The changelog is automatically generated and merged %changelog +* Thu Oct 04 2018 Sanne Raymaekers - 179-1 +- Machines: Detach disk from VM with LibvirtDBus provider +- Machines: Offer cockpit-machines as Application + * Wed Sep 19 2018 Marius Vollmer - 178-1 - Dropped support for KubeVirt diff --git a/sources b/sources index d89a440..be3685d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cockpit-178.tar.xz) = 03d6dce4763ad195b6352acb9c073ca6a0eb0afcdf52852da56fd7c272c7048ce9abdfcc6112f765dbb322fd204f7f8db7c5fb6f921b0488e6e2d50e2937790b +SHA512 (cockpit-179.tar.xz) = 0c00a7eb27a1f5ac2798e342322cc42b991974973ee84685daf1f969369e12afe728a59f2ef9e6e172bfa19f901d3e312476ec357c6ac49e2c4f92a951bc0729