diff --git a/cockpit.spec b/cockpit.spec index b627dc9..4e70e9c 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: 2%{?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} @@ -171,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 @@ -358,7 +364,10 @@ fi %endif %changelog -* Wed Mar 17 2015 Stef Walter - 0.42-2 +* Wed Mar 18 2015 Stef Walter - 0.43-1 +- Update to 0.43 release + +* Tue Mar 17 2015 Stef Walter - 0.42-2 - Fix obseleting cockpit-assets * Sat Mar 14 2015 Stef Walter - 0.42-1 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