diff --git a/SPECS/cockpit.spec b/SPECS/cockpit.spec index 575536e..d2939a7 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 @@ -31,7 +31,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 @@ -812,6 +812,9 @@ via PackageKit. %endif # build optional extension packages %changelog +* Sun Nov 4 2018 Johnny Hughes 173-7 +- Manual CentOS Debranding + * Tue Sep 25 2018 Martin Pitt 173-7 - Build against fixed build root with all architectures again rhbz#1628490