From 78d6223425d02e588f0f99114a38e4a62d1fa343 Mon Sep 17 00:00:00 2001
From: Cockpit Project <cockpituous@gmail.com>
Date: Fri, 12 Oct 2018 10:17:55 +0000
Subject: [PATCH] Update to 180-1

- Move to ssh SHA256 fingerprints
- Machines: Show error messages in the correct place
---
 .gitignore   |  1 +
 cockpit.spec | 25 +++++++++++++++++++++----
 sources      |  2 +-
 3 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index a3a323f..69807aa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -137,3 +137,4 @@
 /cockpit-177.tar.xz
 /cockpit-178.tar.xz
 /cockpit-179.tar.xz
+/cockpit-180.tar.xz
diff --git a/cockpit.spec b/cockpit.spec
index 5090d45..13ec15c 100644
--- a/cockpit.spec
+++ b/cockpit.spec
@@ -1,5 +1,5 @@
 # This spec file has been automatically updated
-Version:	179
+Version:	180
 Release: 1%{?dist}
 #
 # This file is maintained at the following location:
@@ -55,7 +55,7 @@ Release: 1%{?dist}
 
 # on RHEL 7.x we build subscriptions; superseded later by
 # external subscription-manager-cockpit
-%if 0%{?rhel} >= 7 && 0%{?rhel} < 8
+%if (0%{?rhel} >= 7 && 0%{?rhel} < 8) && 0%{?centos} == 0
 %define build_subscriptions 1
 %endif
 
@@ -140,7 +140,7 @@ Recommends: (cockpit-docker if /usr/bin/docker)
 Recommends: (cockpit-networkmanager if NetworkManager)
 Recommends: (cockpit-storaged if udisks2)
 Recommends: cockpit-packagekit
-%if 0%{?rhel} >= 8
+%if 0%{?rhel} >= 8 && 0%{?centos} == 0
 Recommends: subscription-manager-cockpit
 %endif
 Suggests: cockpit-pcp
@@ -306,8 +306,9 @@ touch kubernetes.list
 %if 0%{?build_basic} == 0
 for pkg in base1 branding motd kdump networkmanager realmd selinux shell sosreport ssh static systemd tuned users; do
     rm -r %{buildroot}/%{_datadir}/cockpit/$pkg
+    rm -f %{buildroot}/%{_datadir}/metainfo/org.cockpit-project.cockpit-${pkg}.metainfo.xml
 done
-for data in applications doc locale man metainfo pixmaps; do
+for data in applications doc locale man pixmaps; do
     rm -r %{buildroot}/%{_datadir}/$data
 done
 for lib in systemd tmpfiles.d firewalld; do
@@ -319,6 +320,7 @@ done
 rm -r %{buildroot}/%{_libdir}/security %{buildroot}/%{_sysconfdir}/pam.d %{buildroot}/%{_sysconfdir}/motd.d %{buildroot}/%{_sysconfdir}/issue.d
 rm %{buildroot}/usr/bin/cockpit-bridge %{buildroot}/usr/sbin/remotectl
 rm -f %{buildroot}%{_libexecdir}/cockpit-ssh
+rm -f %{buildroot}%{_datadir}/metainfo/cockpit.appdata.xml
 %endif
 
 # when not building optional packages, remove their files
@@ -332,6 +334,8 @@ rm -r %{buildroot}/%{_prefix}/%{__lib}/cockpit-test-assets %{buildroot}/%{_sysco
 rm -r %{buildroot}/%{_libexecdir}/cockpit-pcp %{buildroot}/%{_localstatedir}/lib/pcp/
 # files from -kubernetes
 rm -f %{buildroot}/%{_libexecdir}/cockpit-kube-auth %{buildroot}/%{_libexecdir}/cockpit-kube-launch %{buildroot}/%{_libexecdir}/cockpit-stub
+# files from -machines
+rm -f %{buildroot}/%{_prefix}/share/metainfo/org.cockpit-project.cockpit-machines.metainfo.xml
 %endif
 
 sed -i "s|%{buildroot}||" *.list
@@ -675,7 +679,11 @@ BuildArch: noarch
 Summary: Cockpit user interface for virtual machines
 Requires: cockpit-bridge >= 122
 Requires: cockpit-system >= 122
+%if 0%{?rhel} == 7
 Requires: libvirt
+%else
+Requires: (libvirt-daemon-kvm or libvirt)
+%endif
 Requires: libvirt-client
 %if 0%{?fedora}
 Requires: libvirt-dbus
@@ -698,7 +706,11 @@ BuildArch: noarch
 Summary: Cockpit user interface for oVirt virtual machines
 Requires: cockpit-bridge >= 122
 Requires: cockpit-system >= 122
+%if 0%{?rhel} == 7
 Requires: libvirt
+%else
+Requires: (libvirt-daemon-kvm or libvirt)
+%endif
 Requires: libvirt-client
 
 %description -n cockpit-machines-ovirt
@@ -811,6 +823,11 @@ via PackageKit.
 
 # The changelog is automatically generated and merged
 %changelog
+* Fri Oct 12 2018 Martin Pitt <martin@piware.de> - 180-1
+
+- Move to ssh SHA256 fingerprints
+- Machines: Show error messages in the correct place
+
 * Thu Oct 04 2018 Sanne Raymaekers <sanne.raymaekers@gmail.com> - 179-1
 - Machines: Detach disk from VM with LibvirtDBus provider
 - Machines: Offer cockpit-machines as Application
diff --git a/sources b/sources
index be3685d..7184499 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (cockpit-179.tar.xz) = 0c00a7eb27a1f5ac2798e342322cc42b991974973ee84685daf1f969369e12afe728a59f2ef9e6e172bfa19f901d3e312476ec357c6ac49e2c4f92a951bc0729
+SHA512 (cockpit-180.tar.xz) = d89f0216ff87c438718cc79f11b70e4e9b708771c3d33e6b7d2df48720aac4579f7c94c1bc42ca4db18985675c09b5710c47ce0a27dfe016539dc12a5d4f1ab0