diff --git a/.cockpit.metadata b/.cockpit.metadata index 5e26b94..d78a31e 100644 --- a/.cockpit.metadata +++ b/.cockpit.metadata @@ -1 +1 @@ -702718ff1b0f65b3f0f501987ae480604649c054 SOURCES/cockpit-195.1.tar.xz +32e1782decda9b6a6aa019a2cad85a0d6c78855d SOURCES/cockpit-195.6.tar.xz diff --git a/.gitignore b/.gitignore index 93249e3..5e1fb80 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/cockpit-195.1.tar.xz +SOURCES/cockpit-195.6.tar.xz diff --git a/SPECS/cockpit.spec b/SPECS/cockpit.spec index 92a9a35..db545bb 100644 --- a/SPECS/cockpit.spec +++ b/SPECS/cockpit.spec @@ -1,5 +1,5 @@ # This spec file has been automatically updated -Version: 195.1 +Version: 195.6 Release: 1%{?dist} # # This file is maintained at the following location: @@ -59,11 +59,15 @@ Release: 1%{?dist} %define build_subscriptions 1 %endif -# cockpit-kubernetes is RHEL 7 and Fedora < 30 only, and 64 bit arches only -%if (0%{?fedora} && 0%{?fedora} < 30) || (0%{?rhel} >= 7 && 0%{?rhel} < 8) -%ifarch aarch64 x86_64 ppc64le s390x %{arm} %{ix86} +# cockpit-kubernetes is 64 bit arches only +%ifarch aarch64 x86_64 ppc64le s390x %define build_kubernetes 1 -%endif +# the primary go-toolset-7-golang is too old (unfixed CVEs), use latest one +%global go_scl_prefix go-toolset-1.12- +# go-toolset-1.12-golang doesn't have "go" in $PATH +%define golang_def GOLANG=/opt/rh/go-toolset-1.12/root/usr/lib/go-toolset-1.12-golang/bin/go +%else +%define golang_def %endif # cockpit-machines-ovirt is RHEL 7 and Fedora < 30 only @@ -72,13 +76,8 @@ Release: 1%{?dist} %endif %if 0%{?rhel} >= 7 -%global go_scl_prefix go-toolset-7- -%else -%global go_scl_prefix %{nil} -%endif - -%if 0%{?rhel} >= 7 %define vdo_on_demand 1 +%define insights_client_on_demand 1 %endif Name: cockpit @@ -164,6 +163,7 @@ Suggests: cockpit-selinux %build exec 2>&1 %configure \ + %{golang_def} \ --disable-silent-rules \ --with-cockpit-user=cockpit-ws \ --with-selinux-config-type=etc_t \ @@ -173,7 +173,8 @@ exec 2>&1 --with-appstream-data-packages='[ "appstream-data" ]' \ %{!?build_dashboard:--disable-ssh} \ --with-nfs-client-package='"nfs-utils"' \ - %{?vdo_on_demand:--with-vdo-package='"vdo"'} + %{?vdo_on_demand:--with-vdo-package='"vdo"'} \ + %{?insights_client_on_demand:--with-insights-client-package='"insights-client"'} make -j4 %{?extra_flags} all %check @@ -453,6 +454,7 @@ Provides: cockpit-tuned = %{version}-%{release} Provides: cockpit-users = %{version}-%{release} %if 0%{?rhel} Provides: cockpit-networkmanager = %{version}-%{release} +Obsoletes: cockpit-shell <= %{version}-%{release} Obsoletes: cockpit-networkmanager Requires: NetworkManager Provides: cockpit-kdump = %{version}-%{release} @@ -690,8 +692,10 @@ Requires: libvirt Requires: (libvirt-daemon-kvm or libvirt) %endif Requires: libvirt-client -%if 0%{?fedora} || 0%{?rhel} >= 8 +%if 0%{?centos} == 0 Requires: libvirt-dbus >= 1.2.0 +%endif +%if 0%{?fedora} || 0%{?rhel} >= 8 # Optional components Recommends: virt-install Recommends: libosinfo @@ -833,6 +837,25 @@ via PackageKit. %endif # build optional extension packages %changelog +* Thu Dec 12 2019 Martin Pitt 195.6-1 +- subscriptions: Avoid PackageKit when installing insights-client + (rhbz#1768917) + +* Thu Nov 07 2019 Martin Pitt 195.5-1 +- subscriptions: Install insights-client on demand (rhbz#1768917) + +* Wed Oct 16 2019 Martin Pitt 195.4-1 +- Update translations (rhbz#1733994) + +* Mon Sep 09 2019 Martin Pitt 195.3-1 +- subscriptions: Add support for Red Hat Insights (rhbz#1748026) +- systemd: Warn if not connected to Insights (rhbz#1748350) + +* Thu Aug 29 2019 Martin Pitt 195.2-1 +- firewall: Only reload firewall when adding custom services (rhbz#1725094) +- networking: Activate a connection after clearing master/slave fields (rhbz#1729378) +- Add Obsoletes: for ancient cockpit-shell package (rhbz#1744208) + * Mon Jun 03 2019 Martin Pitt 195.1-1 - Update translations rhbz#1688228