From 018aea4cb2fd0c37b1e32269cf2a2d3a23c8affc Mon Sep 17 00:00:00 2001
From: petervo <petervo@redhat.com>
Date: Wed, 1 Apr 2015 10:44:38 -0700
Subject: [PATCH] Update to 0.49 release

Rename cockpitd to cockpit-wrapper

Remove cockpit-daemon package and install
cockpit-wrapper with the cockpit-bridge package
---
 cockpit.spec | 37 ++++++++++++++++---------------------
 sources      |  2 +-
 2 files changed, 17 insertions(+), 22 deletions(-)

diff --git a/cockpit.spec b/cockpit.spec
index 59a6803..f6244c9 100644
--- a/cockpit.spec
+++ b/cockpit.spec
@@ -23,7 +23,7 @@ Name:           cockpit
 %if %{defined gitcommit}
 Version:        %{gitcommit}
 %else
-Version:        0.48
+Version:        0.49
 %endif
 Release:        1%{?dist}
 Summary:        A user interface for Linux servers
@@ -40,7 +40,6 @@ Source1:        cockpit.pam
 
 BuildRequires: pkgconfig(gio-unix-2.0)
 BuildRequires: pkgconfig(json-glib-1.0)
-BuildRequires: pkgconfig(udisks2) >= 2.1.0
 BuildRequires: pkgconfig(libsystemd-daemon)
 BuildRequires: pkgconfig(polkit-agent-1) >= 0.105
 BuildRequires: pam-devel
@@ -80,7 +79,6 @@ BuildRequires: sed
 BuildRequires: xmlto
 
 Requires: %{name}-bridge = %{version}-%{release}
-Requires: %{name}-daemon = %{version}-%{release}
 Requires: %{name}-ws = %{version}-%{release}
 Requires: %{name}-shell = %{version}-%{release}
 %ifarch x86_64 armv7hl
@@ -92,6 +90,8 @@ Requires: %{name}-subscriptions = %{version}-%{release}
 %if %{defined selinux}
 Requires: %{name}-selinux-policy = %{version}-%{release}
 %endif
+Provides: %{name}-daemon
+Obsoletes: %{name}-daemon < 0.48
 
 %description
 Cockpit runs in a browser and can manage your network of GNU/Linux
@@ -104,19 +104,6 @@ Summary: Cockpit bridge server-side component
 The Cockpit bridge component installed server side and runs commands on the
 system on behalf of the web based user interface.
 
-%package daemon
-Summary: Deprecated wrappers for various configuration APIs
-Requires: udisks2 >= 2.1.0
-Requires: mdadm
-Requires: lvm2
-Requires: realmd
-Requires: storaged
-
-%description daemon
-Summary: Deprecated wrappers for various configuration APIs such as udisks2.
-Soon these will be accessed directly from the cockpit
-user interface, and this package will disappear.
-
 %package doc
 Summary: Cockpit deployment and developer guide
 
@@ -140,6 +127,11 @@ Requires: NetworkManager
 Requires: shadow-utils
 Requires: grep
 Requires: /usr/bin/date
+Requires: udisks2 >= 2.1.0
+Requires: mdadm
+Requires: lvm2
+Requires: realmd
+Requires: storaged
 Provides: %{name}-assets
 Obsoletes: %{name}-assets < 0.32
 BuildArch: noarch
@@ -207,7 +199,7 @@ install -p -m 644 cockpit.pp %{buildroot}%{_datadir}/selinux/targeted/
 %endif
 
 # Build the package lists for resource packages
-find %{buildroot}%{_datadir}/%{name}/base1 %{buildroot}%{_datadir}/%{name}/legacy %{buildroot}%{_datadir}/%{name}/shell %{buildroot}%{_datadir}/%{name}/system -type f > shell.list
+find %{buildroot}%{_datadir}/%{name}/base1 %{buildroot}%{_datadir}/%{name}/legacy %{buildroot}%{_datadir}/%{name}/shell %{buildroot}%{_datadir}/%{name}/system %{buildroot}%{_datadir}/%{name}/domain -type f > shell.list
 find %{buildroot}%{_datadir}/%{name}/subscriptions -type f > subscriptions.list
 
 %ifnarch x86_64 armv7hl
@@ -254,12 +246,9 @@ rm -rf %{buildroot}/debug
 %doc %{_mandir}/man1/cockpit-bridge.1.gz
 %{_bindir}/cockpit-bridge
 %attr(4755, -, -) %{_libexecdir}/cockpit-polkit
+%{_libexecdir}/cockpit-wrapper
 %{_libdir}/security/pam_reauthorize.so
-
-%files daemon
-%doc %{_mandir}/man8/cockpitd.8.gz
 %{_datadir}/dbus-1/services/com.redhat.Cockpit.service
-%{_libexecdir}/cockpitd
 
 %files doc
 %exclude %{_docdir}/%{name}/AUTHORS
@@ -400,6 +389,12 @@ fi
 %endif
 
 %changelog
+* Wed Apr 01 2015 Peter <petervo@redhat.com> - 0.49-1
+- Update to 0.49 release.
+- cockpitd was renamed to cockpit-wrapper the cockpit-daemon
+  package was removed and is now installed with the
+  cockpit-bridge package.
+
 * Mon Mar 30 2015 Peter <petervo@redhat.com> - 0.48-1
 - Update to 0.48 release
 
diff --git a/sources b/sources
index 0484d7c..b0ba896 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-aabd9cdb547fc9a05ea1beeac6b5ef84  cockpit-0.48.tar.bz2
+eb83e5b5b795e0a56dccbcacc1139492  cockpit-0.49.tar.bz2
 6299c6f81e83b8e5c9d45008e2e4da63  cockpit.pam