From 7ed7d57a981d97e5ce6d2c67aad64e684e2b7456 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Oct 30 2018 08:13:16 +0000
Subject: import cockpit-176-3.el7


---

diff --git a/SPECS/cockpit.spec b/SPECS/cockpit.spec
index a727f8e..1ae0660 100644
--- a/SPECS/cockpit.spec
+++ b/SPECS/cockpit.spec
@@ -7,6 +7,10 @@
 # by tools/gen-spec-dependencies during "make dist", but keep a hardcoded fallback
 %define required_base 122
 
+%if 0%{?centos}
+%define rhel 0
+%endif
+
 # for testing this already gets set in fedora.install, as we want the target
 # VERSION_ID, not the mock chroot's one
 %if "%{!?os_version_id:1}"
@@ -15,8 +19,10 @@
 
 %define _hardened_build 1
 
-# define to build the dashboard
+# define to build the dashboard; i686 buildroot does not have libssh-devel
+%ifarch x86_64 %{arm} aarch64 ppc64le s390x
 %define build_dashboard 1
+%endif
 
 # build basic packages like cockpit-bridge
 %define build_basic 1
@@ -35,7 +41,7 @@
 # on RHEL 7.x we build subscriptions; superseded later by
 # external subscription-manager-cockpit
 %if 0%{?rhel} >= 7 && 0%{?rhel} < 8
-%define build_subscriptions 0 
+%define build_subscriptions 1
 %endif
 
 
@@ -44,7 +50,7 @@
 %define libssh_version 0.6.0
 %endif
 
-%if 0%{?rhel} >= 8
+%if 0%{?rhel} >= 7
 %global go_scl_prefix go-toolset-7-
 %else
 %global go_scl_prefix %{nil}
@@ -62,10 +68,10 @@ URL:            https://cockpit-project.org/
 
 Version:        176
 %if %{defined wip}
-Release:        1.%{wip}%{?dist}
+Release:        2.%{wip}%{?dist}
 Source0:        cockpit-%{version}.tar.gz
 %else
-Release:        2%{?dist}
+Release:        3%{?dist}
 Source0:        https://github.com/cockpit-project/cockpit/releases/download/%{version}/cockpit-%{version}.tar.xz
 %endif
 
@@ -150,6 +156,7 @@ fi
 exec 2>&1
 %configure \
     --disable-silent-rules \
+    %{!?build_dashboard:--disable-ssh} \
     --with-cockpit-user=cockpit-ws \
     --with-selinux-config-type=etc_t \
 %if 0%{?rhel} >= 7 && 0%{?rhel} < 8
@@ -197,7 +204,7 @@ echo '%{_libexecdir}/cockpit-ssh' >> base.list
 echo '%dir %{_datadir}/cockpit/dashboard' >> dashboard.list
 find %{buildroot}%{_datadir}/cockpit/dashboard -type f >> dashboard.list
 %else
-rm -rf %{buildroot}/%{_datadir}/cockpit/dashboard
+rm -rf %{buildroot}/%{_datadir}/cockpit/dashboard %{buildroot}/%{_datadir}/cockpit/ssh
 touch dashboard.list
 %endif
 
@@ -247,8 +254,13 @@ find %{buildroot}%{_datadir}/cockpit/machines -type f >> machines.list
 echo '%dir %{_datadir}/cockpit/ovirt' > ovirt.list
 find %{buildroot}%{_datadir}/cockpit/ovirt -type f >> ovirt.list
 
+# on CentOS systems we don't have the required setroubleshoot-server packages
+%if 0%{?centos}
+rm -rf %{buildroot}%{_datadir}/cockpit/selinux
+%else
 echo '%dir %{_datadir}/cockpit/selinux' > selinux.list
 find %{buildroot}%{_datadir}/cockpit/selinux -type f >> selinux.list
+%endif
 
 %ifarch x86_64 %{arm} aarch64 ppc64le i686 s390x
 %if 0%{?fedora} || 0%{?rhel} < 8
@@ -410,8 +422,6 @@ embed or extend Cockpit.
 %exclude %{_docdir}/cockpit/COPYING
 %exclude %{_docdir}/cockpit/README.md
 %{_docdir}/cockpit
-/usr/share/cockpit/ovirt/*
-/usr/share/cockpit/apps/*
 
 %package system
 Summary: Cockpit admin interface package for configuring and troubleshooting a system
@@ -567,6 +577,8 @@ The Cockpit component for managing networking.  This package uses NetworkManager
 
 %endif
 
+%if 0%{?rhel}%{?centos} == 0
+
 %package selinux
 Summary: Cockpit SELinux package
 Requires: cockpit-bridge >= %{required_base}
@@ -583,6 +595,8 @@ utility setroubleshoot to diagnose and resolve SELinux issues.
 %files selinux -f selinux.list
 %{_datadir}/metainfo/org.cockpit-project.cockpit-selinux.metainfo.xml
 
+%endif
+
 %else # build basic packages
 
 # RPM requires this
@@ -712,7 +726,7 @@ bastion hosts, and a basic dashboard.
 
 %endif
 
-%ifarch x86_64 %{arm} aarch64 ppc64le s390x %{ix86}
+%ifarch x86_64 %{arm} aarch64 ppc64le i686 s390x
 
 %if 0%{?fedora} || 0%{?rhel} < 8
 %package -n cockpit-docker
@@ -752,7 +766,7 @@ Provides: cockpit-stub = %{version}-%{release}
 The Cockpit components for visualizing and configuring a Kubernetes
 cluster. Installed on the Kubernetes master. This package is not yet complete.
 
-%if 0%{?rhel} >= 8
+%if 0%{?rhel} >= 7
 %enable_gotoolset7
 %endif
 
@@ -775,14 +789,21 @@ The Cockpit component for installing package updates, via PackageKit.
 %endif # build optional extension packages
 
 %changelog
-* Fri Sep 28 2018 Johnny Hughes <johnny@centos.org> 176-2
-- Manual CentOS Debranding
-
-* Thu Aug 30 2018 Martin Pitt <mpitt@redhat.com> 176-2
-- Update to 176 release
+* Thu Aug 30 2018 Martin Pitt <mpitt@redhat.com> 176-3
 - Storage: Offer installation of VDO on demand
 - Machines: Add disks to a virtual machine
 
+* Tue Aug 14 2018 Martin Pitt <mpitt@redhat.com> 173-3
+- Re-enable cockpit-kubernetes, Go is now available in
+  extras-rhel-7.6-go-toolset. (RCM-38564)
+
+* Tue Jul 31 2018 Martin Pitt <mpitt@redhat.com> 173-2
+- Update to 173 release
+- Kubernetes: VM detail page
+- Realmd: Install on demand
+- Temporarily disable cockpit-kubernetes, until Go becomes available
+  (RCM-38564)
+
 * Mon Jul 16 2018 Martin Pitt <mpitt@redhat.com> 172-2
 - Update to 172 release
 - Software Updates: Layout rework