From 70ca2bc5042b64f93e450dc794339a9afc19ce2a Mon Sep 17 00:00:00 2001 From: Johnny Hughes Date: Mar 07 2018 16:21:40 +0000 Subject: Manual CentOS Debranding --- diff --git a/SPECS/cockpit.spec b/SPECS/cockpit.spec index eb44907..648d047 100644 --- a/SPECS/cockpit.spec +++ b/SPECS/cockpit.spec @@ -7,9 +7,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 # for testing this already gets set in fedora.install, as we want the target # VERSION_ID, not the mock chroot's one @@ -205,12 +205,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 @@ -301,6 +301,8 @@ embed or extend Cockpit. %exclude %{_docdir}/%{name}/COPYING %exclude %{_docdir}/%{name}/README.md %{_docdir}/%{name} +/usr/share/cockpit/ovirt/* +/usr/share/cockpit/apps/* %package machines Summary: Cockpit user interface for virtual machines @@ -566,7 +568,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 @@ -583,7 +585,7 @@ utility setroubleshoot to diagnose and resolve SELinux issues. %files selinux -f selinux.list -%endif +#%endif %ifarch x86_64 %{arm} aarch64 ppc64le s390x @@ -636,6 +638,9 @@ The Cockpit component for installing package updates, via PackageKit. %changelog +* Wed Mar 7 2018 Johnny Hughes 160-1 +- Manual CentOS Debranding + * Mon Jan 29 2018 Martin Pitt 160-1 - Add check boxes for common NFS mount options - Redesign package list on Software Updates page and show RHEL Errata