[cockpit/f22] Update to 0.43 release

[Stef Walter]

commit 2c12227acd6265c17efd12d51cf6e1bb5c9c2325
Author: Stef Walter <stefw at redhat.com>
Date:   Wed Mar 18 10:31:09 2015 +0100

    Update to 0.43 release

 cockpit.spec | 21 +++++++++++++++++----
 sources      |  2 +-
 2 files changed, 18 insertions(+), 5 deletions(-)
---
diff --git a/cockpit.spec b/cockpit.spec
index ce5c509..2910e88 100644
--- a/cockpit.spec
+++ b/cockpit.spec
@@ -2,6 +2,8 @@
 #  * gitcommit xxxx
 #  * selinux 1
 
+%define branding default
+
 # Our SELinux policy gets built in tests and f21 and lower
 %if %{defined gitcommit}
 %define extra_flags CFLAGS='-O2 -Wall -Werror -fPIC'
@@ -10,15 +12,19 @@
 %if 0%{?fedora} > 0 && 0%{?fedora} <= 21
 %define selinux 1
 %endif
+%if 0%{?fedora} > 0 && 0%{?fedora} <= 22
+%define branding fedora
+%endif
 %if 0%{?rhel}
 %define selinux 1
+%define branding rhel
 %endif
 
 Name:           cockpit
 %if %{defined gitcommit}
 Version:        %{gitcommit}
 %else
-Version:        0.42
+Version:        0.43
 %endif
 Release:        1%{?dist}
 Summary:        A user interface for Linux servers
@@ -81,7 +87,7 @@ Requires: %{name}-shell = %{version}-%{release}
 %ifarch x86_64
 Requires: %{name}-docker = %{version}-%{release}
 %endif
-%if 0%{?rhel}
+%if 0%{?rhel} && 0%{?centos} == 0
 Requires: %{name}-subscriptions = %{version}-%{release}
 %endif
 %if %{defined selinux}
@@ -133,7 +139,8 @@ Summary: Cockpit Shell user interface package
 Requires: %{name}-bridge = %{version}-%{release}
 Requires: NetworkManager
 Requires: grep
-Obsoletes: %{name}-assets
+Provides: %{name}-assets
+Obsoletes: %{name}-assets < 0.32
 BuildArch: noarch
 
 %description shell
@@ -170,7 +177,7 @@ The Cockpit Web Service listens on the network, and authenticates users.
 %if %{defined gitcommit}
 env NOCONFIGURE=1 ./autogen.sh
 %endif
-%configure --disable-static --disable-silent-rules --with-cockpit-user=cockpit-ws
+%configure --disable-static --disable-silent-rules --with-cockpit-user=cockpit-ws --with-branding=%{branding}
 make -j1 %{?extra_flags} all
 %if %{defined selinux}
 make selinux
@@ -357,6 +364,12 @@ fi
 %endif
 
 %changelog
+* Wed Mar 18 2015 Stef Walter <stefw at redhat.com> - 0.43-1
+- Update to 0.43 release
+
+* Tue Mar 17 2015 Stef Walter <stefw at redhat.com> - 0.42-2
+- Fix obseleting cockpit-assets
+
 * Sat Mar 14 2015 Stef Walter <stefw at redhat.com> - 0.42-1
 - Update to 0.42 release
 
diff --git a/sources b/sources
index 8f4a3e2..4f5a195 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2eaf581dd74b0d4e41389f788119ce2e  cockpit-0.42.tar.bz2
+d4ac9c2e33598d4eba283e51ac1256ff  cockpit-0.43.tar.bz2