From 21b0cf5928908ee0c0f05a29d93442db3be59647 Mon Sep 17 00:00:00 2001
From: Stef Walter <stefw@redhat.com>
Date: Wed, 12 Aug 2015 21:41:34 +0200
Subject: [PATCH] Update to 0.70 release

- Depend on kubernetes-client instead of kubernetes
---
 .gitignore   |  1 +
 cockpit.spec | 31 +++++++++++++++++++------------
 sources      |  2 +-
 3 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1607deb..3edb0f3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -49,3 +49,4 @@
 /cockpit-0.67.tar.bz2
 /cockpit-0.68.tar.bz2
 /cockpit-0.69.tar.bz2
+/cockpit-0.70.tar.bz2
diff --git a/cockpit.spec b/cockpit.spec
index 832b2ec..b6b7f39 100644
--- a/cockpit.spec
+++ b/cockpit.spec
@@ -4,12 +4,16 @@
 
 %define branding auto
 
-# Our SELinux policy gets built in tests and f21 and lower
 %if %{defined gitcommit}
 %define extra_flags CFLAGS='-O2 -Wall -Werror -fPIC'
-%define selinux 1
 %define branding default
 %endif
+
+#Defaults for our SELinux policy toggle
+%if %{undefined selinux}
+%if %{defined gitcommit}
+%define selinux 1
+%endif
 %if 0%{?fedora} > 0 && 0%{?fedora} <= 21
 %define selinux 1
 %endif
@@ -19,6 +23,7 @@
 %if 0%{?centos}
 %define rhel 0
 %endif
+%endif
 
 %define _hardened_build 1
 
@@ -31,7 +36,7 @@ Name:           cockpit
 %if %{defined gitcommit}
 Version:        %{gitcommit}
 %else
-Version:        0.69
+Version:        0.70
 %endif
 Release:        1%{?dist}
 Summary:        A user interface for Linux servers
@@ -76,7 +81,7 @@ BuildRequires: nodejs
 %endif
 
 # For selinux
-%if %{defined selinux}
+%if 0%{?selinux}
 BuildRequires: selinux-policy-devel
 BuildRequires: checkpolicy
 BuildRequires: selinux-policy-doc
@@ -174,14 +179,13 @@ The Cockpit Web Service listens on the network, and authenticates users.
 env NOCONFIGURE=1 ./autogen.sh
 %endif
 %configure --disable-static --disable-silent-rules --with-cockpit-user=cockpit-ws --with-branding=%{branding}
-make -j1 %{?extra_flags} all
-%if %{defined selinux}
+make -j %{?extra_flags} all
+%if 0%{?selinux}
 make selinux
 %endif
 
 %check
-# The check doesnt run on koji as it requires network
-# make check
+make -j check
 
 %install
 make install DESTDIR=%{buildroot}
@@ -196,7 +200,7 @@ 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
 install -p -m 644 AUTHORS COPYING README.md %{buildroot}%{_docdir}/%{name}/
-%if %{defined selinux}
+%if 0%{?selinux}
 install -d %{buildroot}%{_datadir}/selinux/targeted
 install -p -m 644 cockpit.pp %{buildroot}%{_datadir}/selinux/targeted/
 %endif
@@ -361,7 +365,7 @@ This package is not yet complete.
 
 %package kubernetes
 Summary: Cockpit user interface for Kubernetes cluster
-Requires: kubernetes >= 0.20.0
+Requires: kubernetes-client >= 0.20.0
 
 %description kubernetes
 The Cockpit components for visualizing and configuring a Kubernetes
@@ -401,7 +405,7 @@ pulls in some necessary packages via dependencies.
 
 %endif
 
-%if %{defined selinux}
+%if 0%{?selinux}
 
 %package selinux-policy
 Summary: SELinux policy for Cockpit testing
@@ -436,9 +440,12 @@ fi
 %endif
 
 %changelog
+* Wed Aug 12 2015 Stef Walter <stefw@redhat.com> - 0.70-1
+- Update to 0.70 release
+- Depend on kubernetes-client instead of kubernetes
+
 * 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 a81844e..c0dfbd2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ab929fb9793d61c1d00b57177677b986  cockpit-0.69.tar.bz2
+89372c7929f1f964947a8fc9a1c7408f  cockpit-0.70.tar.bz2