diff --git a/.gitignore b/.gitignore index 4f8b738..31f4f5b 100644 --- a/.gitignore +++ b/.gitignore @@ -66,3 +66,4 @@ /cockpit-0.86.tar.bz2 /cockpit-0.87.tar.bz2 /cockpit-0.88.tar.bz2 +/cockpit-0.89.tar.bz2 diff --git a/cockpit.spec b/cockpit.spec index 3a2bdbf..84115cb 100644 --- a/cockpit.spec +++ b/cockpit.spec @@ -1,4 +1,4 @@ -%define tag 0.88 +%define tag 0.89 %define rev 1 # # This file is maintained at the following location: @@ -84,18 +84,32 @@ BuildRequires: krb5-server # For documentation BuildRequires: xmlto +# Mandatory components of "cockpit" Requires: %{name}-bridge = %{version}-%{release} -Requires: %{name}-networkmanager = %{version}-%{release} Requires: %{name}-ws = %{version}-%{release} Requires: %{name}-shell = %{version}-%{release} + +# Optional components (for f24 we use soft deps) +%if 0%{?fedora} >= 24 || 0%{?rhel} >= 8 +Recommends: %{name}-networkmanager = %{version}-%{release} +Recommends: %{name}-storaged = %{version}-%{release} +%ifarch x86_64 armv7hl +Recommends: %{name}-docker = %{version}-%{release} +%endif +Suggests: %{name}-pcp = %{version}-%{release} +Suggests: %{name}-kubernetes = %{version}-%{release} + +# Older releases need to have strict requirements +%else +Requires: %{name}-networkmanager = %{version}-%{release} Requires: %{name}-storaged = %{version}-%{release} %ifarch x86_64 armv7hl Requires: %{name}-docker = %{version}-%{release} %endif -%if 0%{?rhel} -Requires: %{name}-subscriptions = %{version}-%{release} + %endif + %description Cockpit runs in a browser and can manage your network of GNU/Linux machines. @@ -454,6 +468,16 @@ pulls in some necessary packages via dependencies. %endif %changelog +* Tue Dec 22 2015 Stef Walter - 0.89-1 +- * Start routine testing of Cockpit on Debian Unstable +- * Make the config file case insensitive +- * Reorder graphs on server summary page +- * Don't suggest syncing users when adding a machine to dashboard +- * Enable weak dependencies for F24+ +- * Show correct data in per interface network graphs +- * Fix the Vagrantfile to pull in latest Cockpit +- * Add Content-Security-Policy header support + * Fri Dec 18 2015 Stef Walter - 0.88-1 - * User interface for OSTree upgrades and rollbacks - * General reusable purpose angular kubernetes client code diff --git a/sources b/sources index d8950a2..510c046 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -71137bc22cbff8ad4e0225d7f0130b68 cockpit-0.88.tar.bz2 +fc2caf0b5598e6d1a75a82030c1eddda cockpit-0.89.tar.bz2