From 69f002c1d94fab9582fa1948c88a58420ff94d65 Mon Sep 17 00:00:00 2001 From: Johnny Hughes Date: Nov 30 2018 13:51:27 +0000 Subject: Manual CentOS Debranding --- diff --git a/SPECS/cockpit.spec b/SPECS/cockpit.spec index d26440a..dcc5cbd 100644 --- a/SPECS/cockpit.spec +++ b/SPECS/cockpit.spec @@ -8,7 +8,7 @@ %define required_base 122 %if 0%{?centos} -%define rhel 0 +%define rhel %{?centos} %endif # for testing this already gets set in fedora.install, as we want the target @@ -40,7 +40,7 @@ # on RHEL 7.x we build subscriptions; superseded later by # external subscription-manager-cockpit -%if 0%{?rhel} >= 7 && 0%{?rhel} < 8 +%if (0%{?rhel} >= 7 && 0%{?rhel} < 8) && 0%{?centos} == 0 %define build_subscriptions 1 %endif @@ -257,13 +257,8 @@ find %{buildroot}%{_datadir}/cockpit/machines -type f >> machines.list echo '%dir %{_datadir}/cockpit/ovirt' > ovirt.list find %{buildroot}%{_datadir}/cockpit/ovirt -type f >> ovirt.list -# on CentOS systems we don't have the required setroubleshoot-server packages -%if 0%{?centos} -rm -rf %{buildroot}%{_datadir}/cockpit/selinux -%else echo '%dir %{_datadir}/cockpit/selinux' > selinux.list find %{buildroot}%{_datadir}/cockpit/selinux -type f >> selinux.list -%endif %ifarch x86_64 %{arm} aarch64 ppc64le i686 s390x %if 0%{?fedora} || 0%{?rhel} < 8 @@ -597,7 +592,7 @@ utility setroubleshoot to diagnose and resolve SELinux issues. %files selinux -f selinux.list %{_datadir}/metainfo/org.cockpit-project.cockpit-selinux.metainfo.xml - + %endif %else # build basic packages @@ -792,6 +787,9 @@ The Cockpit component for installing package updates, via PackageKit. %endif # build optional extension packages %changelog +* Thu Nov 29 2018 Johnny Hughes 176-4 +- Manual CentOS Debranding + * Mon Oct 29 2018 Martin Pitt 176-4 - Switch to ssh SHA256 fingerprints, to fix crash in FIPS mode rhbz#1585191