From bd935c5526dc194052cb557f4a27c4b386fd9fd7 Mon Sep 17 00:00:00 2001 From: Johnny Hughes Date: Apr 14 2017 15:39:59 +0000 Subject: Manual CentOS Debranding --- diff --git a/SPECS/cockpit.spec b/SPECS/cockpit.spec index 8be8f2a..1aa89d5 100644 --- a/SPECS/cockpit.spec +++ b/SPECS/cockpit.spec @@ -10,10 +10,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 - %define _hardened_build 1 # define to build the dashboard @@ -198,12 +194,8 @@ echo '%dir %{_datadir}/%{name}/machines' > machines.list find %{buildroot}%{_datadir}/%{name}/machines -type f >> machines.list # on CentOS systems we don't have the required setroubleshoot-server packages -%if 0%{?centos} -rm -rf %{buildroot}%{_datadir}/%{name}/selinux -%else echo '%dir %{_datadir}/%{name}/selinux' > selinux.list find %{buildroot}%{_datadir}/%{name}/selinux -type f >> selinux.list -%endif %ifarch x86_64 %{arm} aarch64 ppc64le echo '%dir %{_datadir}/%{name}/docker' > docker.list @@ -590,6 +582,9 @@ cluster. Installed on the Kubernetes master. This package is not yet complete. %endif %changelog +* Fri Apr 14 2017 Johnny Hughes 135-4 +- CentOS Mods + * Thu Mar 23 2017 Dominik Perpeet 135-4 - The cockpit package doesn't require the dashboard anymore - The dashboard package conflicts with older bridge and ws versions