From 0da493e1eddcc838003c6694d3f6b8cc5d319553 Mon Sep 17 00:00:00 2001 From: Johnny Hughes Date: Nov 29 2018 14:08:19 +0000 Subject: Manual CentOS Debranding --- diff --git a/SPECS/cockpit.spec b/SPECS/cockpit.spec index 8fdce44..c106f4e 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 @@ -805,6 +805,9 @@ via PackageKit. %endif # build optional extension packages %changelog +* Wed Nov 28 2018 Johnny Hughes +- Manual CentOS Debranding + * Tue Oct 30 2018 Martin Pitt 173.1-1 - Crash fixes spotted by coverity rhbz#1644345 - Fix race condition with fslist channels rhbz#1644346