From 93b938018096c708f9883f74e5bd020643b79041 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Nov 30 2017 18:37:56 +0000
Subject: import cockpit-155-1.el7


---

diff --git a/.cockpit.metadata b/.cockpit.metadata
index 62a61fb..d093bc6 100644
--- a/.cockpit.metadata
+++ b/.cockpit.metadata
@@ -1 +1 @@
-afb66caf363f95a68546d336deb3314f31028c15 SOURCES/cockpit-151.tar.xz
+2463a77ed6548bcc54e66b529be1e42ddfad6e11 SOURCES/cockpit-155.tar.xz
diff --git a/.gitignore b/.gitignore
index d9deeea..4d2f94a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/cockpit-151.tar.xz
+SOURCES/cockpit-155.tar.xz
diff --git a/SPECS/cockpit.spec b/SPECS/cockpit.spec
index d75c403..1dc52de 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:        151
+Version:        155
 %if %{defined wip}
 Release:        1.%{wip}%{?dist}
 Source0:        cockpit-%{version}.tar.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
@@ -230,6 +230,11 @@ rm %{buildroot}/%{_libexecdir}/cockpit-stub
 touch kubernetes.list
 %endif
 
+# On RHEL, apps/ovirt are not currently built
+%if 0%{?rhel}
+rm -rf %{buildroot}/%{_datadir}/%{name}/apps %{buildroot}/%{_datadir}/%{name}/ovirt
+%endif
+
 sed -i "s|%{buildroot}||" *.list
 
 # Build the package lists for debug package, and move debug files to installed locations
@@ -385,6 +390,13 @@ Requires: storaged-lvm2 >= 2.1.1
 Requires: storaged-iscsi >= 2.1.1
 Requires: device-mapper-multipath
 %endif
+%if 0%{?fedora}
+Requires: python3
+Requires: python3-dbus
+%else
+Requires: python
+Requires: python-dbus
+%endif
 BuildArch: noarch
 
 %description storaged
@@ -551,7 +563,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 +580,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 +633,9 @@ The Cockpit component for installing package updates, via PackageKit.
 
 
 %changelog
-* Tue Oct 24 2017 Johnny Hughes <johnny@centos.org> 151-1
-- Manual CentOS Debranding
+* Tue Nov 07 2017 Martin Pitt <mpitt@redhat.com> 155-1
+ - Add NFS client support to the Storage page
+ - Add checkboxes for common Storage encryption and mount options
 
 * Thu Sep 21 2017 Martin Pitt <mpitt@redhat.com> 151-1
 - Fix tooltip on "Edit Server" button on Dashboard rhbz#1449887