Accepting request 1272605 from GNOME:Factory

Fix comment inside conf file (forwarded request 1272565 from dimstar)

OBS-URL: https://build.opensuse.org/request/show/1272605
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/glib2-branding?expand=0&rev=26

glib2-branding-gnome_defaults.conf

@@ -37,9 +37,6 @@ x-scheme-handler/mailto=evolution.desktop
 # All URI schemes declared by yelp
 yelp.desktop
 
-# Prefer banshee for multimedia where possible
-!banshee-1.desktop
-
 # Except prefer moonshine for WM
 video/x-ms-asf-plugin=moonshine.desktop
 video/x-msvideo=moonshine.desktop
@@ -70,15 +67,15 @@ application/x-rpm=package-manager.desktop
 !gpk-install-file.desktop
 
 # Nice GNOME default applications
-org.gnome.eog.desktop
+org/gnome.Loupe.desktop
-org.gnome.Evince.desktop
+org.gnome.Papers.desktop
 org.gnome.TextEditor.desktop
 !org.gnome.FileRoller.desktop
 # file-roller supports iso, but most people will prefer brasero:
 application/x-cd-image=brasero.desktop
 org.gnome.Nautilus.desktop
-# evince supports multi-page tiff, but most people will prefer eog:
+# evince supports multi-page tiff, but most people will prefer Loupe:
-image/tiff=org.gnome.eog.desktop
+image/tiff=org.gnome.Loupe.desktop
 # evince supports odp, but we really want OOo
 application/vnd.sun.xml.impress=libreoffice-impress.desktop
 application/vnd.oasis.opendocument.presentation=libreoffice-impress.desktop

glib2-branding.changes

@@ -1,3 +1,50 @@
+-------------------------------------------------------------------
+Thu Apr 24 07:00:49 UTC 2025 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Update defaults to match current situation:
+  + Remove banshee preference: banshee has not been shipped since
+    2016.
+  + Add Loupe to the preferred applications for images
+  + Do not use Eog by default. As it's alphabetically before
+    Loupe, Eog would always win the way it was listed (when
+    installed).
+  + Explicitly set image/tiff to org.gnome.Loupe as Eog is no
+    longer part of the default installations.
+
+-------------------------------------------------------------------
+Wed Apr  9 02:00:47 UTC 2025 - Alynx Zhou <alynx.zhou@suse.com>
+
+- Update SLE version to 16. (bsc#1240822)
+
+-------------------------------------------------------------------
+Wed Feb  5 14:03:48 UTC 2025 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Assign Ctrl-Alt-Delete to shutdown, as we used to have in GNOME
+  since ever. So far, no shortcut assigned to Logout.
+
+-------------------------------------------------------------------
+Fri Jan 31 13:34:54 UTC 2025 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Add org.gnome.Papers.desktop as a preferred application: it's
+  favored over Evince when present (alphabetically listed behind
+  Evince, which suits us well here).
+
+-------------------------------------------------------------------
+Fri Nov  1 01:52:19 UTC 2024 - Xiaoguang Wang <xiaoguang.wang@suse.com>
+
+- Remove "picture-uri-dark" in schema "org.gnome.desktop.screensaver",
+  there is no this key in schema currently.
+
+-------------------------------------------------------------------
+Tue Oct  1 19:32:14 UTC 2024 - Lubos Kocman <lubos.kocman@suse.com>
+
+- Align default wallpaper and screensaver urls with new light and dark
+  theme wallpaper for Tumbleweed gh#openSUSE/branding#154
+  and gh#openSUSE/branding#160
+- openSUSE no longer uses static/dynamic xml.
+  See issue gh#openSUSE/branding#161
+- Use zoom instead of streched with 4096x4096 unified wallpaper
+
 -------------------------------------------------------------------
 Thu Mar 14 10:38:22 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
 

glib2-branding.gschema.override.in

@@ -11,19 +11,19 @@ toolkit-accessibility = false
 [org.gnome.desktop.background]
 ## Default wallpaper
 picture-uri = "@@WALLPAPER_URI@@"
-picture-uri-dark = "@@WALLPAPER_URI@@"
+picture-uri-dark = "@@WALLPAPER_URI_DARK@@"
-picture-options = "stretched"
+picture-options = "zoom"
-@@IF_openSUSE@@primary-color = "#258c06"
+@@IF_openSUSE@@primary-color = "#63bbb2ff"
-@@IF_openSUSE@@secondary-color = "#258c06"
+@@IF_openSUSE@@secondary-color = "#0c2a27ff"
 @@IF_SLE@@primary-color = "#0C322C"
 @@IF_SLE@@secondary-color = "#0C322C"
 
 [org.gnome.desktop.screensaver]
 @@IF_openSUSE@@picture-uri = "@@WALLPAPER_URI@@"
 @@IF_SLE@@picture-uri = "@@LOCKSCREEN_URI@@"
-picture-options = "stretched"
+picture-options = "zoom"
-@@IF_openSUSE@@primary-color = "#258c06"
+@@IF_openSUSE@@primary-color = "#63bbb2ff"
-@@IF_openSUSE@@secondary-color = "#258c06"
+@@IF_openSUSE@@secondary-color = "#0c2a27ff"
 @@IF_SLE@@primary-color = "#0C322C"
 @@IF_SLE@@secondary-color = "#0C322C"
 @@IF_SLE@@lock-delay = 300
@@ -73,6 +73,8 @@ disabled-gtk-modules = [ "pk-gtk-module" ]
 
 [org.gnome.settings-daemon.plugins.media-keys]
 help = ['Help', '<Super>F1']
+logout = ['']
+shutdown = ['<Control><Alt>Delete']
 
 [org.gnome.shell]
 ## Default apps shown in the gnome-shell dash

glib2-branding.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package glib2-branding
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -52,7 +52,7 @@ BuildArch:      noarch
 Version:        42.1
 Release:        0
 %else
-Version:        15
+Version:        16
 Release:        0
 %endif
 
@@ -90,8 +90,18 @@ cp -a %{SOURCE1} COPYING
 cp -a %{SOURCE2} glib2-branding.gschema.override.in
 
 %build
+# Legacy XML compatability with SLES15 branding.
+# We no longer use xml and have dark/light bg variants.
+# Can be removed if SLES adopts gh#openSUSE/branding#161
+%if 0%{?build_SLE}
 test -f %{_datadir}/wallpapers/%{branding_name}-default.xml
 sed "s,@@WALLPAPER_URI@@,file://%{_datadir}/wallpapers/%{branding_name}-default.xml,;s,@@LOCKSCREEN_URI@@,file://%{_datadir}/wallpapers/%{branding_name}-default-static-lockscreen.xml,"  glib2-branding.gschema.override.in > glib2-branding.gschema.override
+%else
+sed -e "s,@@WALLPAPER_URI@@,file://%{_datadir}/wallpapers/%{branding_name}default/contents/images/default.png," \
+    -e "s,@@WALLPAPER_URI_DARK@@,file://%{_datadir}/wallpapers/%{branding_name}default/contents/images/default-dark.png," \
+    glib2-branding.gschema.override.in > glib2-branding.gschema.override
+%endif
+
 #for sound theme
 %if 0%{?build_openSUSE}
 sed "s:@@IF_openSUSE@@::g" < glib2-branding.gschema.override | \