Skip to content

Commit

Permalink
Add various slfo based patches
Browse files Browse the repository at this point in the history
This is mirroring the changes in:
https://src.opensuse.org/cockpit/cockpit/pulls/6

- suse_docs.patch: update documentation to point at new links (bsc#1226050)
- remove_rh_links.patch: remove additional hardcoded RH refs (bsc#1221336)
- hide-pcp.patch: correct patch to properly disable pcp on micro
  (bsc#1226049)
- suse-microos-branding.patch: use suse ID as branding instead of sle-micro
  (bsc#1227441)
  • Loading branch information
SludgeGirl authored and JanZerebecki committed Oct 9, 2024
1 parent 6851dc7 commit 5cf053c
Showing 1 changed file with 7 additions and 3 deletions.
10 changes: 7 additions & 3 deletions tools/cockpit.spec
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,8 @@ Patch104: selinux_libdir.patch
Patch105: fix-libexecdir.patch
Patch106: 0005-cockpit-ws-user-remove-default-deps.patch

Patch201: remove_rh_links.patch

%define build_all 1
%if 0%{?rhel} == 8 && 0%{?epel} == 0 && !0%{?build_all}

Expand Down Expand Up @@ -248,6 +250,8 @@ BuildRequires: python3-tox-current-env
%patch -P 105 -p1
%endif

%patch -P 201 -p1

cp %SOURCE1 tools/cockpit.pam
#
local-npm-registry %{_sourcedir} install --include=dev --ignore-scripts
Expand Down Expand Up @@ -431,13 +435,13 @@ sed -i "s|%{buildroot}||" *.list
# remove brandings with stale symlinks. Means they don't match
# the distro.
pushd %{buildroot}/%{_datadir}/cockpit/branding
ls --hide={default,kubernetes,opensuse,registry,sle-micro,suse} | xargs rm -rv
ls --hide={default,kubernetes,opensuse,registry,suse} | xargs rm -rv
popd
# need this in SUSE as post build checks dislike stale symlinks
install -m 644 -D /dev/null %{buildroot}/run/cockpit/motd
test -e %{buildroot}/usr/share/cockpit/branding/opensuse/default-1920x1200.jpg || install -m 644 -D /dev/null %{buildroot}/usr/share/cockpit/branding/opensuse/default-1920x1200.jpg
test -e %{buildroot}/usr/share/cockpit/branding/sle-micro/apple-touch-icon.png || install -m 644 -D /dev/null %{buildroot}/usr/share/cockpit/branding/sle-micro/apple-touch-icon.png
test -e %{buildroot}/usr/share/cockpit/branding/sle-micro/default-1920x1200.png || install -m 644 -D /dev/null %{buildroot}/usr/share/cockpit/branding/sle-micro/default-1920x1200.png
test -e %{buildroot}/usr/share/cockpit/branding/suse/apple-touch-icon.png || install -m 644 -D /dev/null %{buildroot}/usr/share/cockpit/branding/suse/apple-touch-icon.png
test -e %{buildroot}/usr/share/cockpit/branding/suse/default-1920x1200.png || install -m 644 -D /dev/null %{buildroot}/usr/share/cockpit/branding/suse/default-1920x1200.png
# remove files of not installable packages
rm -r %{buildroot}%{_datadir}/cockpit/sosreport
rm -f %{buildroot}/%{_prefix}/share/metainfo/org.cockpit-project.cockpit-sosreport.metainfo.xml
Expand Down

0 comments on commit 5cf053c

Please sign in to comment.