#50681 Issue 50680 - Remove branding from upstream spec file
Closed 3 years ago by spichugi. Opened 4 years ago by vashirov.
vashirov/389-ds-base ds50680  into  master

file modified
-6
@@ -409,12 +409,6 @@ 

  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

  

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

rebased onto 3f4f52a

4 years ago

Pull-Request has been merged by vashirov

4 years ago

389-ds-base is moving from Pagure to Github. This means that new issues and pull requests
will be accepted only in 389-ds-base's github repository.

This pull request has been cloned to Github as issue and is available here:
- https://github.com/389ds/389-ds-base/issues/3736

If you want to continue to work on the PR, please navigate to the github issue,
download the patch from the attachments and file a new pull request.

Thank you for understanding. We apologize for all inconvenience.

Pull-Request has been closed by spichugi

3 years ago
Metadata