From fb8282fb55a3b4e6826235116ab835918f66151a Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Nov 30 2017 17:05:20 +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 cc775c0..1dc52de 100644
--- a/SPECS/cockpit.spec
+++ b/SPECS/cockpit.spec
@@ -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
@@ -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
@@ -621,6 +633,10 @@ The Cockpit component for installing package updates, via PackageKit.
 
 
 %changelog
+* 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