From e087a3c6da440176c2bb5c4d72286e7d3b198007 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Aug 01 2017 13:05:33 +0000 Subject: import cockpit-141-4.el7 --- diff --git a/SPECS/cockpit.spec b/SPECS/cockpit.spec index b6539ae..9bfcb09 100644 --- a/SPECS/cockpit.spec +++ b/SPECS/cockpit.spec @@ -4,15 +4,15 @@ # %define branding auto -%define rev 3 +%define rev 4 # earliest base that the subpackages work on; the instances of this get computed/updated # 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,8 +609,8 @@ 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-4 +- Bump for rebuild on more architectures * Thu Jun 29 2017 Dominik Perpeet 141-3 - Fix dashboard dependency rhbz#1466423