From d6d5998f79eb352b88efa8a02387124282da562e Mon Sep 17 00:00:00 2001 From: Johnny Hughes Date: Oct 24 2017 13:46:02 +0000 Subject: Manual CentOS Debranding --- diff --git a/SPECS/cockpit.spec b/SPECS/cockpit.spec index cc775c0..d75c403 100644 --- a/SPECS/cockpit.spec +++ b/SPECS/cockpit.spec @@ -9,9 +9,9 @@ # by tools/gen-spec-dependencies during "make dist", but keep a hardcoded fallback %define required_base 122 -%if 0%{?centos} -%define rhel 0 -%endif +#%if 0%{?centos} +#%define rhel 0 +#%endif %define _hardened_build 1 @@ -200,12 +200,12 @@ 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 +#%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 +#%endif %ifarch x86_64 %{arm} aarch64 ppc64le i686 s390x echo '%dir %{_datadir}/%{name}/docker' > docker.list @@ -551,7 +551,7 @@ The Cockpit component for managing networking. This package uses NetworkManager %endif -%if 0%{?rhel}%{?centos} == 0 +#%if 0%{?rhel}%{?centos} == 0 %package selinux Summary: Cockpit SELinux package @@ -568,7 +568,7 @@ utility setroubleshoot to diagnose and resolve SELinux issues. %files selinux -f selinux.list -%endif +#%endif %ifarch x86_64 %{arm} aarch64 ppc64le s390x @@ -621,6 +621,9 @@ The Cockpit component for installing package updates, via PackageKit. %changelog +* Tue Oct 24 2017 Johnny Hughes 151-1 +- Manual CentOS Debranding + * Thu Sep 21 2017 Martin Pitt 151-1 - Fix tooltip on "Edit Server" button on Dashboard rhbz#1449887