diff --git a/cockpit.changes b/cockpit.changes index a5a12e4..df7df08 100644 --- a/cockpit.changes +++ b/cockpit.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Feb 15 12:21:55 UTC 2024 - Adam Majer + +- suse-microos-branding.patch: fix branding for SLE Micro + (bsc#1219929) + ------------------------------------------------------------------- Wed Jan 31 11:02:35 UTC 2024 - Adam Majer diff --git a/cockpit.spec b/cockpit.spec index 24599fe..43102e7 100644 --- a/cockpit.spec +++ b/cockpit.spec @@ -454,7 +454,9 @@ ls --hide={default,kubernetes,opensuse,registry,sle-micro,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 -install -m 644 -D /dev/null %{buildroot}/usr/share/cockpit/branding/opensuse/default-1920x1200.jpg ||: +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 # 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 diff --git a/suse-microos-branding.patch b/suse-microos-branding.patch index 4e9513f..def5e25 100644 --- a/suse-microos-branding.patch +++ b/suse-microos-branding.patch @@ -14,11 +14,11 @@ properly. create mode 100644 src/branding/sle-micro/Makefile.am create mode 100644 src/branding/sle-micro/branding.css -diff --git a/Makefile.am b/Makefile.am -index fb619f3f253..ec761210a52 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -249,6 +249,7 @@ include src/branding/default/Makefile.am +Index: cockpit-309/Makefile.am +=================================================================== +--- cockpit-309.orig/Makefile.am ++++ cockpit-309/Makefile.am +@@ -175,6 +175,7 @@ include src/branding/default/Makefile.am include src/branding/fedora/Makefile.am include src/branding/kubernetes/Makefile.am include src/branding/opensuse/Makefile.am @@ -26,11 +26,10 @@ index fb619f3f253..ec761210a52 100644 include src/branding/registry/Makefile.am include src/branding/rhel/Makefile.am include src/branding/scientific/Makefile.am -diff --git a/src/branding/sle-micro/Makefile.am b/src/branding/sle-micro/Makefile.am -new file mode 100644 -index 00000000000..3f4b762afa5 +Index: cockpit-309/src/branding/sle-micro/Makefile.am +=================================================================== --- /dev/null -+++ b/src/branding/sle-micro/Makefile.am ++++ cockpit-309/src/branding/sle-micro/Makefile.am @@ -0,0 +1,11 @@ +slemicrobrandingdir = $(datadir)/cockpit/branding/sle-micro + @@ -39,15 +38,14 @@ index 00000000000..3f4b762afa5 + $(NULL) + +install-data-hook:: -+ $(LN_S) -f /usr/share/wallpapers/SLEdefault/contents/images/1920x1200.png $(DESTDIR)$(slemicrobrandingdir)/default-1920x1200.png -+ $(LN_S) -f /usr/share/pixmaps/distribution-logos/square-hicolor.svg $(DESTDIR)$(slemicrobrandingdir)/square-hicolor.svg -+ $(LN_S) -f /usr/share/pixmaps/distribution-logos/favicon.ico $(DESTDIR)$(slemicrobrandingdir)/favicon.ico -+ $(LN_S) -f /usr/share/pixmaps/distribution-logos/apple-touch-icon.png $(DESTDIR)$(slemicrobrandingdir)/apple-touch-icon.png -diff --git a/src/branding/sle-micro/branding.css b/src/branding/sle-micro/branding.css -new file mode 100644 -index 00000000000..e3c7939c464 ++ ln -sf /usr/share/wallpapers/SLEdefault/contents/images/1920x1200.png $(DESTDIR)$(slemicrobrandingdir)/default-1920x1200.png ++ ln -sf /usr/share/pixmaps/distribution-logos/square-hicolor.svg $(DESTDIR)$(slemicrobrandingdir)/square-hicolor.svg ++ ln -sf /usr/share/pixmaps/distribution-logos/favicon.ico $(DESTDIR)$(slemicrobrandingdir)/favicon.ico ++ ln -sf /usr/share/pixmaps/distribution-logos/apple-touch-icon.png $(DESTDIR)$(slemicrobrandingdir)/apple-touch-icon.png +Index: cockpit-309/src/branding/sle-micro/branding.css +=================================================================== --- /dev/null -+++ b/src/branding/sle-micro/branding.css ++++ cockpit-309/src/branding/sle-micro/branding.css @@ -0,0 +1,87 @@ +/* Extra overrides */ +:root {