From 473df9bce116b0d4dcc15252906f36ed1e5e68df Mon Sep 17 00:00:00 2001
From: Stef Walter <stefw@redhat.com>
Date: Thu, 3 Apr 2014 23:14:05 +0200
Subject: [PATCH] Update to upstream 0.4 release

---
 cockpit.spec | 24 +++++++++++++-----------
 sources      |  3 ++-
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/cockpit.spec b/cockpit.spec
index ebefcdc..4709c1a 100644
--- a/cockpit.spec
+++ b/cockpit.spec
@@ -1,8 +1,5 @@
-%global         gitrev  5e1faad
-%global         gitdate 20140204
-
 Name:           cockpit
-Version:        0.3
+Version:        0.4
 Release:        1%{?dist}
 Summary:        A user interface for Linux servers
 
@@ -16,6 +13,7 @@ BuildRequires: pkgconfig(gudev-1.0)
 BuildRequires: pkgconfig(json-glib-1.0)
 BuildRequires: pkgconfig(gobject-introspection-1.0)
 BuildRequires: pkgconfig(udisks2) >= 2.1.0
+BuildRequires: pkgconfig(libgsystem)
 BuildRequires: storaged
 BuildRequires: pkgconfig(libnm-glib)
 BuildRequires: pkgconfig(libsystemd-daemon)
@@ -86,9 +84,9 @@ 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-ws-testing.service
-rm -f %{buildroot}%{_unitdir}/cockpit-ws-testing.socket
+rm -f %{buildroot}%{_unitdir}/cockpit-testing.socket
 rm -f %{buildroot}%{_unitdir}/test-server.service
 rm -f %{buildroot}%{_unitdir}/test-server.socket
 rm -rf %{buildroot}%{_datadir}/cockpit-test-assets
@@ -102,9 +100,9 @@ rm -rf %{buildroot}%{_datadir}/cockpit-test-assets
 %config(noreplace) %{_sysconfdir}/%{name}
 %config(noreplace) %{_sysconfdir}/dbus-1/system.d/com.redhat.Cockpit.conf
 %config(noreplace) %{_sysconfdir}/pam.d/cockpit
-%{_unitdir}/cockpit-ws.service
-%{_unitdir}/cockpit-ws.socket
 %{_unitdir}/cockpit.service
+%{_unitdir}/cockpit.socket
+%{_unitdir}/cockpitd.service
 %{_datadir}/dbus-1/system-services/com.redhat.Cockpit.service
 %{_libexecdir}/cockpitd
 %{_libexecdir}/cockpit-ws
@@ -116,19 +114,23 @@ rm -rf %{buildroot}%{_datadir}/cockpit-test-assets
 %{_datadir}/%{name}
 
 %post
-%systemd_post cockpit-ws.service
+%systemd_post cockpitd.service
 %systemd_post cockpit.service
 
 %preun
-%systemd_preun cockpit-ws.service
+%systemd_preun cockpitd.service
 %systemd_preun cockpit.service
 
 %postun
-%systemd_postun_with_restart cockpit-ws.service 
+%systemd_postun_with_restart cockpitd.service 
 %systemd_postun_with_restart cockpit.service 
 
 
 %changelog
+* Thu Apr 03 2014 Stef Walter <stefw@redhat.com> 0.4-1
+- Update to upstream 0.4 release
+- Lots of packaging cleanup and polish
+
 * Fri Mar 28 2014 Stef Walter <stefw@redhat.com> 0.3-1
 - Update to upstream 0.3 release
 
diff --git a/sources b/sources
index ce79810..a567f1f 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-e8d48d65a6f58ea8363b6dc074a4f3af  cockpit-0.3.tar.bz2
+bce12917150fae5e79d1dc99d55b4981  cockpit-0.4.tar.bz2
+ec58a1b89f7bd85a42a0257bafb07e6c  cockpit.pam