From b80b67459bb51657617bd099e95d2ead568a3326 Mon Sep 17 00:00:00 2001
From: Stef Walter <stefw@redhat.com>
Date: Wed, 21 May 2014 15:28:13 +0200
Subject: [PATCH] Update to upstream 0.8 release

---
 cockpit.spec | 17 +++++++++--------
 sources      |  2 +-
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/cockpit.spec b/cockpit.spec
index 7af9c4b..e674464 100644
--- a/cockpit.spec
+++ b/cockpit.spec
@@ -1,5 +1,5 @@
 Name:           cockpit
-Version:        0.7
+Version:        0.8
 Release:        1%{?dist}
 Summary:        A user interface for Linux servers
 
@@ -44,6 +44,7 @@ Requires: realmd
 Requires: udisks2 >= 2.1.0
 Requires: mdadm
 Requires: lvm2
+Requires: storaged
 
 Requires: cockpit-assets
 
@@ -85,7 +86,6 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pam.d
 install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/cockpit
 rm -f %{buildroot}/%{_libdir}/cockpit/*.so
 rm -f %{buildroot}%{_sysconfdir}/dbus-1/system.d/com.redhat.Cockpit.DBusTests.Test.conf
-rm -f %{buildroot}%{_unitdir}/cockpitd-testing.service
 rm -f %{buildroot}%{_unitdir}/cockpit-testing.service
 rm -f %{buildroot}%{_unitdir}/cockpit-testing.socket
 rm -f %{buildroot}%{_unitdir}/test-server.service
@@ -99,12 +99,10 @@ rm -rf %{buildroot}%{_datadir}/cockpit-test-assets
 %doc %{_mandir}/man8/cockpit-ws.8.gz
 %doc %{_mandir}/man8/cockpitd.8.gz
 %config(noreplace) %{_sysconfdir}/%{name}
-%config(noreplace) %{_sysconfdir}/dbus-1/system.d/com.redhat.Cockpit.conf
 %config(noreplace) %{_sysconfdir}/pam.d/cockpit
 %{_unitdir}/cockpit.service
 %{_unitdir}/cockpit.socket
-%{_unitdir}/cockpitd.service
-%{_datadir}/dbus-1/system-services/com.redhat.Cockpit.service
+%{_datadir}/dbus-1/services/com.redhat.Cockpit.service
 %{_libexecdir}/cockpitd
 %{_libexecdir}/cockpit-ws
 %{_libexecdir}/cockpit-session
@@ -117,19 +115,22 @@ rm -rf %{buildroot}%{_datadir}/cockpit-test-assets
 %{_datadir}/%{name}
 
 %post
-%systemd_post cockpitd.service
+chgrp wheel %{_sharedstatedir}/%{name}
+chmod 775 %{_sharedstatedir}/%{name}
 %systemd_post cockpit.service
 
 %preun
-%systemd_preun cockpitd.service
 %systemd_preun cockpit.service
 
 %postun
-%systemd_postun_with_restart cockpitd.service 
 %systemd_postun_with_restart cockpit.service 
 
 
 %changelog
+* Wed May 21 2014 Stef Walter <stefw@redhat.com> 0.8-1
+- Update to upstream 0.8 release
+- cockpitd now runs as a user session DBus service
+
 * Mon May 19 2014 Stef Walter <stefw@redhat.com> 0.7-1
 - Update to upstream 0.7 release
 
diff --git a/sources b/sources
index d846228..6932dec 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-74850be4a7b20868ea9d850987ecd8cd  cockpit-0.7.tar.bz2
+621659deb75713024a68824d8a8b3e55  cockpit-0.8.tar.bz2
 ec58a1b89f7bd85a42a0257bafb07e6c  cockpit.pam