From e6f81cd7ebf6a433e97952912a218b0982ba482d Mon Sep 17 00:00:00 2001
From: Stef Walter <stefw@redhat.com>
Date: Thu, 6 Aug 2015 12:54:22 +0200
Subject: [PATCH] Update to 0.69 release.

- Require kubernetes 0.20.0 or later for cockpit-kubernetes
---
 .gitignore   |  1 +
 cockpit.spec | 18 +++++++++++-------
 sources      |  3 +--
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index d2a53bb..1607deb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -48,3 +48,4 @@
 /cockpit-0.66.tar.bz2
 /cockpit-0.67.tar.bz2
 /cockpit-0.68.tar.bz2
+/cockpit-0.69.tar.bz2
diff --git a/cockpit.spec b/cockpit.spec
index ef96282..832b2ec 100644
--- a/cockpit.spec
+++ b/cockpit.spec
@@ -31,7 +31,7 @@ Name:           cockpit
 %if %{defined gitcommit}
 Version:        %{gitcommit}
 %else
-Version:        0.68
+Version:        0.69
 %endif
 Release:        1%{?dist}
 Summary:        A user interface for Linux servers
@@ -184,7 +184,7 @@ make selinux
 # make check
 
 %install
-make install DESTDIR=%{buildroot} DBGDIR=/debug
+make install DESTDIR=%{buildroot}
 %if %{defined gitcommit}
 make install-test-assets DESTDIR=%{buildroot}
 mkdir -p %{buildroot}/%{_datadir}/polkit-1/rules.d
@@ -242,10 +242,10 @@ touch kubernetes.list
 sed -i "s|%{buildroot}||" *.list
 
 # Build the package lists for debug package, and move debug files to installed locations
-find %{buildroot}/debug%{_datadir}/%{name} -type f -o -type l > debug.list
-sed -i "s|%{buildroot}/debug||" debug.list
-tar -C %{buildroot}/debug -cf - . | tar -C %{buildroot} -xf -
-rm -rf %{buildroot}/debug
+find %{buildroot}/usr/src/debug%{_datadir}/%{name} -type f -o -type l > debug.list
+sed -i "s|%{buildroot}/usr/src/debug||" debug.list
+tar -C %{buildroot}/usr/src/debug -cf - . | tar -C %{buildroot} -xf -
+rm -rf %{buildroot}/usr/src/debug
 
 # On RHEL subscriptions and docker are part of the shell package
 %if 0%{?rhel}
@@ -361,7 +361,7 @@ This package is not yet complete.
 
 %package kubernetes
 Summary: Cockpit user interface for Kubernetes cluster
-Requires: kubernetes >= 0.16.2
+Requires: kubernetes >= 0.20.0
 
 %description kubernetes
 The Cockpit components for visualizing and configuring a Kubernetes
@@ -436,6 +436,10 @@ fi
 %endif
 
 %changelog
+* Thu Aug 06 2015 Stef Walter <stefw@redhat.com> - 0.69-1
+- Update to 0.69 release.
+- Require kubernetes 0.20.0 or later for cockpit-kubernetes
+
 * Wed Jul 29 2015 Peter <petervo@redhat.com> - 0.68-1
 - Update to 0.68 release.
 
diff --git a/sources b/sources
index 7dc08da..a81844e 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-efd774377e6ad476b7af2a9e6425f00b  cockpit-0.68.tar.bz2
-6299c6f81e83b8e5c9d45008e2e4da63  cockpit.pam
+ab929fb9793d61c1d00b57177677b986  cockpit-0.69.tar.bz2