From fc6cf2b2c9befc6fea436bc8c3341d4c46bbec91 Mon Sep 17 00:00:00 2001
From: Johnny Hughes <johnny@centos.org>
Date: Sep 28 2018 19:33:26 +0000
Subject: Manual CentOS Debranding


---

diff --git a/SPECS/cockpit.spec b/SPECS/cockpit.spec
index e7c66d0..a727f8e 100644
--- a/SPECS/cockpit.spec
+++ b/SPECS/cockpit.spec
@@ -7,10 +7,6 @@
 # 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}"
@@ -39,7 +35,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 1
+%define build_subscriptions 0 
 %endif
 
 
@@ -251,13 +247,8 @@ 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
@@ -419,6 +410,8 @@ 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
@@ -574,8 +567,6 @@ 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}
@@ -592,8 +583,6 @@ 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
@@ -723,7 +712,7 @@ bastion hosts, and a basic dashboard.
 
 %endif
 
-%ifarch x86_64 %{arm} aarch64 ppc64le s390x
+%ifarch x86_64 %{arm} aarch64 ppc64le s390x %{ix86}
 
 %if 0%{?fedora} || 0%{?rhel} < 8
 %package -n cockpit-docker
@@ -747,7 +736,7 @@ This package is not yet complete.
 %endif
 %endif
 
-%ifarch aarch64 x86_64 ppc64le i686 s390x
+%ifarch aarch64 x86_64 ppc64le s390x
 
 %package -n cockpit-kubernetes
 Summary: Cockpit user interface for Kubernetes cluster
@@ -786,6 +775,9 @@ 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
 - Storage: Offer installation of VDO on demand