From d3c983cb51ad4b84a74d70e9df01bb384fac21ae Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Oct 19 2017 17:42:14 +0000
Subject: import cockpit-151-1.el7


---

diff --git a/.cockpit.metadata b/.cockpit.metadata
index 1582f4d..62a61fb 100644
--- a/.cockpit.metadata
+++ b/.cockpit.metadata
@@ -1 +1 @@
-d587727f4e9e6812ba78c049f3a4868d4d9d3d53 SOURCES/cockpit-148.tar.xz
+afb66caf363f95a68546d336deb3314f31028c15 SOURCES/cockpit-151.tar.xz
diff --git a/.gitignore b/.gitignore
index 34f5a25..d9deeea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/cockpit-148.tar.xz
+SOURCES/cockpit-151.tar.xz
diff --git a/SPECS/cockpit.spec b/SPECS/cockpit.spec
index 7a5c5eb..cc775c0 100644
--- a/SPECS/cockpit.spec
+++ b/SPECS/cockpit.spec
@@ -9,9 +9,9 @@
 # by tools/gen-spec-dependencies during "make dist", but keep a hardcoded fallback
 %define required_base 122
 
-#%if 0%{?centos}
-#%define rhel 0
-#%endif
+%if 0%{?centos}
+%define rhel 0
+%endif
 
 %define _hardened_build 1
 
@@ -29,7 +29,7 @@ Summary:        A user interface for Linux servers
 License:        LGPLv2+
 URL:            http://cockpit-project.org/
 
-Version:        148
+Version:        151
 %if %{defined wip}
 Release:        1.%{wip}%{?dist}
 Source0:        cockpit-%{version}.tar.gz
@@ -98,7 +98,7 @@ machines.
 %{_docdir}/%{name}/COPYING
 %{_docdir}/%{name}/README.md
 %dir %{_datadir}/%{name}
-%{_datadir}/appdata/cockpit.appdata.xml
+%{_datadir}/metainfo/cockpit.appdata.xml
 %{_datadir}/applications/cockpit.desktop
 %{_datadir}/pixmaps/cockpit.png
 %doc %{_mandir}/man1/cockpit.1.gz
@@ -200,12 +200,12 @@ echo '%dir %{_datadir}/%{name}/machines' > machines.list
 find %{buildroot}%{_datadir}/%{name}/machines -type f >> machines.list
 
 # on CentOS systems we don't have the required setroubleshoot-server packages
-#%if 0%{?centos}
-#rm -rf %{buildroot}%{_datadir}/%{name}/selinux
-#%else
+%if 0%{?centos}
+rm -rf %{buildroot}%{_datadir}/%{name}/selinux
+%else
 echo '%dir %{_datadir}/%{name}/selinux' > selinux.list
 find %{buildroot}%{_datadir}/%{name}/selinux -type f >> selinux.list
-#%endif
+%endif
 
 %ifarch x86_64 %{arm} aarch64 ppc64le i686 s390x
 echo '%dir %{_datadir}/%{name}/docker' > docker.list
@@ -551,7 +551,7 @@ The Cockpit component for managing networking.  This package uses NetworkManager
 
 %endif
 
-#%if 0%{?rhel}%{?centos} == 0
+%if 0%{?rhel}%{?centos} == 0
 
 %package selinux
 Summary: Cockpit SELinux package
@@ -568,7 +568,7 @@ utility setroubleshoot to diagnose and resolve SELinux issues.
 
 %files selinux -f selinux.list
 
-#%endif
+%endif
 
 %ifarch x86_64 %{arm} aarch64 ppc64le s390x
 
@@ -621,8 +621,8 @@ The Cockpit component for installing package updates, via PackageKit.
 
 
 %changelog
-* Thu Sep 07 2017 Johnny Hughes <johnny@centos.org> 148-1
-- CentOS Mods
+* Thu Sep 21 2017 Martin Pitt <mpitt@redhat.com> 151-1
+- Fix tooltip on "Edit Server" button on Dashboard rhbz#1449887
 
 * Fri Aug 04 2017 Martin Pitt <mpitt@redhat.com> 148-1
 - Update Cluster/Registry Image tags design to current Openshift Web Console