From 3f4f52a72e39a4a24fe8f24199842d0314071000 Mon Sep 17 00:00:00 2001 From: Viktor Ashirov Date: Oct 31 2019 13:56:13 +0000 Subject: Issue 50680 - Remove branding from upstream spec file Bug Description: Branding logic is triggered in EPEL builds. We should not have it in upstream as it should be applied in the downstream only. Fix Description: Remove branding. Fixes: https://pagure.io/389-ds-base/issue/50680 Reviewed by: mreynolds (Thanks!) --- diff --git a/rpm/389-ds-base.spec.in b/rpm/389-ds-base.spec.in index 48ef43d..22ed298 100644 --- a/rpm/389-ds-base.spec.in +++ b/rpm/389-ds-base.spec.in @@ -409,12 +409,6 @@ mkdir -p %{buildroot}%{_datadir}/gdb/auto-load%{_sbindir} mkdir -p %{buildroot}%{_datadir}/cockpit make DESTDIR="$RPM_BUILD_ROOT" install -# Cockpit branding, and directory and file list -%if 0%{?rhel} -sed -i "s/389 Directory Server/Red Hat Directory Server/" %{buildroot}%{_datadir}/cockpit/389-console/banner.html -sed -i "s/389 Directory Server/Red Hat Directory Server/" %{buildroot}%{_datadir}/cockpit/389-console/manifest.json -sed -i "s/389 Directory Server/Red Hat Directory Server/" %{buildroot}%{_datadir}/metainfo/389-console/org.port389.cockpit_console.metainfo.xml -%endif find %{buildroot}%{_datadir}/cockpit/389-console -type d | sed -e "s@%{buildroot}@@" | sed -e 's/^/\%dir /' > cockpit.list find %{buildroot}%{_datadir}/cockpit/389-console -type f | sed -e "s@%{buildroot}@@" >> cockpit.list