From 8b8510beb716d5287162aa45e100b2d446ce8102 Mon Sep 17 00:00:00 2001 From: Johnny Hughes Date: Jul 17 2018 21:06:46 +0000 Subject: Manual CentOS Drbranding --- diff --git a/SPECS/cockpit.spec b/SPECS/cockpit.spec index 6511e4c..7d67426 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 @@ -32,7 +32,7 @@ # on RHEL 7.x we build subscriptions; superseded in RHEL 8 (and Fedora) by # external subscription-manager-cockpit %if 0%{?rhel} >= 7 && 0%{?rhel} < 8 -%define build_subscriptions 1 +%define build_subscriptions 0 %endif @@ -227,12 +227,12 @@ echo '%dir %{_datadir}/%{name}/ovirt' > ovirt.list find %{buildroot}%{_datadir}/%{name}/ovirt -type f >> ovirt.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 @@ -383,6 +383,8 @@ embed or extend Cockpit. %exclude %{_docdir}/%{name}/COPYING %exclude %{_docdir}/%{name}/README.md %{_docdir}/%{name} +/usr/share/cockpit/ovirt/* +/usr/share/cockpit/apps/* # storaged on Fedora < 27, udisks on newer ones # Recommends: not supported in RHEL < 8 @@ -552,7 +554,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 @@ -569,7 +571,7 @@ utility setroubleshoot to diagnose and resolve SELinux issues. %files selinux -f selinux.list -%endif +#%endif %else # build basic packages @@ -745,6 +747,9 @@ The Cockpit component for installing package updates, via PackageKit. %endif # build optional extension packages %changelog +* Mon Jul 16 2018 Johnny Hughes 169-1 +- Manual CentOS Debranding + * Wed May 30 2018 Martin Pitt 169-1 - Update to 169 release - Storage: Offer installation of NFS client support on demand