diff --git a/.gitignore b/.gitignore index 916055c..7ff9eed 100644 --- a/.gitignore +++ b/.gitignore @@ -84,3 +84,4 @@ /cockpit-0.111.tar.xz /cockpit-0.112.tar.xz /cockpit-0.113.tar.xz +/cockpit-0.114.tar.xz diff --git a/cockpit.spec b/cockpit.spec index c2625ee..8a86bc2 100644 --- a/cockpit.spec +++ b/cockpit.spec @@ -1,4 +1,4 @@ -%define tag 0.113 +%define tag 0.114 %define rev 1 # # This file is maintained at the following location: @@ -217,7 +217,7 @@ echo '%dir %{_datadir}/%{name}/ostree' > ostree.list find %{buildroot}%{_datadir}/%{name}/ostree -type f >> ostree.list # on RHEL systems we don't have the required setroubleshoot-server packages -%if 0%{?rhel} +%if 0%{?rhel}%{?centos} rm -rf %{buildroot}%{_datadir}/%{name}/selinux %else echo '%dir %{_datadir}/%{name}/selinux' > selinux.list @@ -427,6 +427,21 @@ subscription management. %files subscriptions -f subscriptions.list +%package networkmanager +Summary: Cockpit user interface for networking, using NetworkManager +Requires: %{name}-shell = %{version}-%{release} +Requires: NetworkManager +BuildArch: noarch + +%description networkmanager +The Cockpit component for managing networking. This package uses NetworkManager. + +%files networkmanager -f networkmanager.list + +%endif + +%if 0%{?rhel}%{?centos} == 0 + %package selinux Summary: Cockpit SELinux package Requires: %{name}-shell = %{version}-%{release} @@ -439,17 +454,6 @@ utility setroubleshoot to diagnose and resolve SELinux issues. %files selinux -f selinux.list -%package networkmanager -Summary: Cockpit user interface for networking, using NetworkManager -Requires: %{name}-shell = %{version}-%{release} -Requires: NetworkManager -BuildArch: noarch - -%description networkmanager -The Cockpit component for managing networking. This package uses NetworkManager. - -%files networkmanager -f networkmanager.list - %endif %ifarch x86_64 armv7hl @@ -504,6 +508,15 @@ pulls in some necessary packages via dependencies. %endif %changelog +* Tue Jul 12 2016 Stef Walter - 0.114-1 +- .104 +- * Network configuration of the Ethernet MTU +- * Red Hat Subscriptions can now specify activation keys and orgs +- * Start integration testing on CentOS +- * SSH Host keys are show on system page +- * Machine ID is shown on system page +- * Show intelligent password score error messages + * Thu Jul 07 2016 Stef Walter - 0.113-1 - * Show timer information for systemd timer jobs - * Use 'active-backup' as the default for new network bonds diff --git a/sources b/sources index 7d314dd..253b578 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -00544933ef3b1488d55ad3f1bc240519 cockpit-0.113.tar.xz +9adf32b2c403fa6c0e960107b5296381 cockpit-0.114.tar.xz