Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package cockpit for openSUSE:Factory checked
in at 2024-02-16 21:41:35
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/cockpit (Old)
and /work/SRC/openSUSE:Factory/.cockpit.new.1815 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cockpit"
Fri Feb 16 21:41:35 2024 rev:41 rq:1146868 version:309
Changes:
--------
--- /work/SRC/openSUSE:Factory/cockpit/cockpit.changes 2024-01-31
23:53:56.293396420 +0100
+++ /work/SRC/openSUSE:Factory/.cockpit.new.1815/cockpit.changes
2024-02-16 21:41:39.784200938 +0100
@@ -1,0 +2,7 @@
+Thu Feb 15 12:21:55 UTC 2024 - Adam Majer <adam.ma...@suse.de>
+
+- suse-microos-branding.patch: fix branding for SLE Micro
+ (bsc#1219929)
+- don't clobber existing links with empty files
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cockpit.spec ++++++
--- /var/tmp/diff_new_pack.DR1eGa/_old 2024-02-16 21:41:41.100248422 +0100
+++ /var/tmp/diff_new_pack.DR1eGa/_new 2024-02-16 21:41:41.100248422 +0100
@@ -454,7 +454,9 @@
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
++++++ suse-microos-branding.patch ++++++
--- /var/tmp/diff_new_pack.DR1eGa/_old 2024-02-16 21:41:41.268254484 +0100
+++ /var/tmp/diff_new_pack.DR1eGa/_new 2024-02-16 21:41:41.272254628 +0100
@@ -14,11 +14,11 @@
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 @@
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 @@
+ $(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 {
