From b7b6cde6dc3464f703a6400702dd271d39c03237 Mon Sep 17 00:00:00 2001
From: petervo <petervo@redhat.com>
Date: Wed, 29 Jul 2015 12:33:16 -0700
Subject: [PATCH] Update to 0.68 release

---
 .gitignore   |  1 +
 cockpit.spec | 36 +++++++++++++++++-------------------
 sources      |  2 +-
 3 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4f3570e..d2a53bb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -47,3 +47,4 @@
 /cockpit-0.65.tar.bz2
 /cockpit-0.66.tar.bz2
 /cockpit-0.67.tar.bz2
+/cockpit-0.68.tar.bz2
diff --git a/cockpit.spec b/cockpit.spec
index 12f2bc8..ef96282 100644
--- a/cockpit.spec
+++ b/cockpit.spec
@@ -31,7 +31,7 @@ Name:           cockpit
 %if %{defined gitcommit}
 Version:        %{gitcommit}
 %else
-Version:        0.67
+Version:        0.68
 %endif
 Release:        1%{?dist}
 Summary:        A user interface for Linux servers
@@ -70,11 +70,6 @@ BuildRequires: systemd
 BuildRequires: polkit
 BuildRequires: pcp-libs-devel
 
-# For cockpit-lvm
-BuildRequires:  libgudev1-devel
-BuildRequires:  lvm2-devel
-BuildRequires:  polkit-devel
-
 %if %{defined gitcommit}
 BuildRequires: npm
 BuildRequires: nodejs
@@ -94,6 +89,7 @@ BuildRequires: xmlto
 Requires: %{name}-bridge = %{version}-%{release}
 Requires: %{name}-ws = %{version}-%{release}
 Requires: %{name}-shell = %{version}-%{release}
+Requires: %{name}-storaged = %{version}-%{release}
 %ifarch x86_64 armv7hl
 Requires: %{name}-docker = %{version}-%{release}
 %endif
@@ -139,11 +135,7 @@ Requires: shadow-utils
 Requires: grep
 Requires: libpwquality
 Requires: /usr/bin/date
-Requires: mdadm
-Requires: lvm2
-%if 0%{?rhel} == 0
-Requires: udisks2 >= 2.1.0
-%else
+%if 0%{?rhel}
 Provides: %{name}-subscriptions = %{version}-%{release}
 Requires: subscription-manager >= 1.13
 %ifarch x86_64 armv7hl
@@ -228,6 +220,9 @@ find %{buildroot}%{_datadir}/%{name}/system -type f >> shell.list
 echo '%dir %{_datadir}/%{name}/subscriptions' > subscriptions.list
 find %{buildroot}%{_datadir}/%{name}/subscriptions -type f >> subscriptions.list
 
+echo '%dir %{_datadir}/%{name}/storage' > storaged.list
+find %{buildroot}%{_datadir}/%{name}/storage -type f >> storaged.list
+
 %ifarch x86_64 armv7hl
 echo '%dir %{_datadir}/%{name}/docker' > docker.list
 find %{buildroot}%{_datadir}/%{name}/docker -type f >> docker.list
@@ -277,14 +272,8 @@ cat subscriptions.list docker.list >> shell.list
 %{_bindir}/cockpit-bridge
 %attr(4755, -, -) %{_libexecdir}/cockpit-polkit
 %{_libexecdir}/cockpit-wrapper
-%{_libexecdir}/cockpit-lvm
-%{_libexecdir}/cockpit-lvm-helper
 %{_libdir}/security/pam_reauthorize.so
 %{_datadir}/dbus-1/services/com.redhat.Cockpit.service
-%{_sysconfdir}/dbus-1/system.d/com.redhat.Cockpit.LVM.conf
-%{_datadir}/dbus-1/system-services/com.redhat.Cockpit.LVM.service
-%{_datadir}/polkit-1/actions/com.redhat.Cockpit.LVM.policy
-%{_datadir}/cockpit/lvm-nolocking/lvm.conf
 
 %files doc
 %exclude %{_docdir}/%{name}/AUTHORS
@@ -382,6 +371,15 @@ cluster. Installed on the Kubernetes master. This package is not yet complete.
 
 %endif
 
+%package storaged
+Summary: Cockpit user interface for storage, using Storaged
+Requires: storaged >= 2.1.1
+
+%description storaged
+The Cockpit component for managing storage.  This package uses Storaged.
+
+%files storaged -f storaged.list
+
 %if %{defined gitcommit}
 
 %package test-assets
@@ -438,8 +436,8 @@ fi
 %endif
 
 %changelog
-* Fri Jul 24 2015 Peter <petervo@redhat.com> - 0.67-1
-- Update to 0.67 release.
+* Wed Jul 29 2015 Peter <petervo@redhat.com> - 0.68-1
+- Update to 0.68 release.
 
 * Thu Jul 23 2015 Peter <petervo@redhat.com> - 0.66-1
 - Update to 0.66 release
diff --git a/sources b/sources
index 6945d0a..7dc08da 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-d4b37e02e7c7a5728c7f58c1dfc45c9f  cockpit-0.67.tar.bz2
+efd774377e6ad476b7af2a9e6425f00b  cockpit-0.68.tar.bz2
 6299c6f81e83b8e5c9d45008e2e4da63  cockpit.pam