From 82faf9f91fb56efcb9c0af2cf2d7faa8803ba5c5 Mon Sep 17 00:00:00 2001
From: Stef Walter <stefw@redhat.com>
Date: Fri, 20 Mar 2015 21:57:01 +0100
Subject: [PATCH] Update to 0.44 release

---
 cockpit.spec | 54 +++++++++++++++++++++++++++++++++++++++-------------
 sources      |  2 +-
 2 files changed, 42 insertions(+), 14 deletions(-)

diff --git a/cockpit.spec b/cockpit.spec
index ea2c901..9f98529 100644
--- a/cockpit.spec
+++ b/cockpit.spec
@@ -23,7 +23,7 @@ Name:           cockpit
 %if %{defined gitcommit}
 Version:        %{gitcommit}
 %else
-Version:        0.43
+Version:        0.44
 %endif
 Release:        2%{?dist}
 Summary:        A user interface for Linux servers
@@ -57,6 +57,7 @@ BuildRequires: docbook-style-xsl
 BuildRequires: keyutils-libs-devel
 BuildRequires: dbus-devel
 BuildRequires: glib-networking
+BuildRequires: sed
 
 BuildRequires: glib2-devel >= 2.37.4
 BuildRequires: systemd
@@ -137,7 +138,10 @@ Cockpit support for reading PCP metrics and loading PCP archives.
 Summary: Cockpit Shell user interface package
 Requires: %{name}-bridge = %{version}-%{release}
 Requires: NetworkManager
+Requires: shadow-utils
+Requires: expect
 Requires: grep
+Requires: /usr/bin/date
 Provides: %{name}-assets
 Obsoletes: %{name}-assets < 0.32
 BuildArch: noarch
@@ -187,7 +191,7 @@ make selinux
 # make check
 
 %install
-%make_install
+make install DESTDIR=%{buildroot} DBGDIR=/debug
 %if %{defined gitcommit}
 make install-test-assets DESTDIR=%{buildroot}
 mkdir -p %{buildroot}/%{_datadir}/polkit-1/rules.d
@@ -203,10 +207,26 @@ install -p -m 644 AUTHORS COPYING README.md %{buildroot}%{_docdir}/%{name}/
 install -d %{buildroot}%{_datadir}/selinux/targeted
 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}/subscriptions -type f > subscriptions.list
 %ifnarch x86_64
 rm -rf %{buildroot}/%{_datadir}/%{name}/docker
 rm -rf %{buildroot}/%{_datadir}/%{name}/kubernetes
+%else
+find %{buildroot}%{_datadir}/%{name}/docker -type f > docker.list
+find %{buildroot}%{_datadir}/%{name}/kubernetes -type f > kubernetes.list
 %endif
+sed -i "s|%{buildroot}||" *.list
+
+# Build the package lists for debug package
+find %{buildroot}/debug%{_datadir}/%{name} -type f > debug.list
+sed -i "s|%{buildroot}/debug||" debug.list
+
+# Move the debug files into place mixed in with the other files
+tar -C %{buildroot}/debug -cf - . | tar -C %{buildroot} -xf -
+rm -rf %{buildroot}/debug
 
 %files
 %{_docdir}/%{name}/AUTHORS
@@ -228,6 +248,8 @@ rm -rf %{buildroot}/%{_datadir}/%{name}/kubernetes
 %{_datadir}/dbus-1/services/com.redhat.Cockpit.service
 %{_libexecdir}/cockpitd
 
+%files debuginfo -f debug.list
+
 %files doc
 %exclude %{_docdir}/%{name}/AUTHORS
 %exclude %{_docdir}/%{name}/COPYING
@@ -241,14 +263,17 @@ rm -rf %{buildroot}/%{_datadir}/%{name}/kubernetes
 # HACK - https://bugzilla.redhat.com/show_bug.cgi?id=1185749
 ( cd /var/lib/pcp/pmns && ./Rebuild -du )
 
-%files shell
-%{_datadir}/%{name}/base1
-%{_datadir}/%{name}/legacy
-%{_datadir}/%{name}/shell
-%{_datadir}/%{name}/system
+%files shell -f shell.list
+%dir %{_datadir}/%{name}/base1
+%dir %{_datadir}/%{name}/base1/fonts
+%dir %{_datadir}/%{name}/base1/images
+%dir %{_datadir}/%{name}/legacy
+%dir %{_datadir}/%{name}/shell
+%dir %{_datadir}/%{name}/shell/images
+%dir %{_datadir}/%{name}/system
 
-%files subscriptions
-%{_datadir}/%{name}/subscriptions
+%files subscriptions -f subscriptions.list
+%dir %{_datadir}/%{name}/subscriptions
 
 %files ws
 %doc %{_mandir}/man5/cockpit.conf.5.gz
@@ -291,8 +316,8 @@ Requires: docker
 The Cockpit components for interacting with Docker and user interface.
 This package is not yet complete.
 
-%files docker
-%{_datadir}/%{name}/docker
+%files docker -f docker.list
+%dir %{_datadir}/%{name}/docker
 
 %package kubernetes
 Summary: Cockpit user interface for Kubernetes cluster
@@ -302,8 +327,8 @@ Requires: kubernetes
 The Cockpit components for visualizing and configuring a Kubernetes
 cluster. Installed on the Kubernetes master. This package is not yet complete.
 
-%files kubernetes
-%{_datadir}/%{name}/kubernetes
+%files kubernetes -f kubernetes.list
+%dir %{_datadir}/%{name}/kubernetes
 
 %endif
 
@@ -363,6 +388,9 @@ fi
 %endif
 
 %changelog
+* Fri Mar 20 2015 Stef Walter <stefw@redhat.com> - 0.44-1
+- Update to 0.44 release
+
 * Thu Mar 19 2015 Stef Walter <stefw@redhat.com> - 0.43-2
 - Don't break EPEL or CentOS builds due to missing branding
 
diff --git a/sources b/sources
index 4f5a195..0a6b513 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d4ac9c2e33598d4eba283e51ac1256ff  cockpit-0.43.tar.bz2
+ced521c9d7e9d39798b296589128b661  cockpit-0.44.tar.bz2