diff --git a/SPECS/cockpit.spec b/SPECS/cockpit.spec index edfc834..b6539ae 100644 --- a/SPECS/cockpit.spec +++ b/SPECS/cockpit.spec @@ -10,9 +10,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 @@ -199,12 +199,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 @@ -550,7 +550,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 @@ -567,7 +567,7 @@ utility setroubleshoot to diagnose and resolve SELinux issues. %files selinux -f selinux.list -%endif +#%endif %ifarch x86_64 %{arm} aarch64 ppc64le s390x @@ -609,6 +609,9 @@ cluster. Installed on the Kubernetes master. This package is not yet complete. %endif %changelog +* Tue Jul 4 2017 Johnny Hughes 141-3 +- CentOS Mods + * Thu Jun 29 2017 Dominik Perpeet 141-3 - Fix dashboard dependency rhbz#1466423