Sync from SUSE:SLFO:1.1 glib2-branding revision 9b44716a21b40105dc65ec1a925feaa9

glib2-branding-gnome_defaults.conf

@@ -71,7 +71,6 @@ application/x-rpm=package-manager.desktop
 
 # Nice GNOME default applications
 org.gnome.eog.desktop
-org.gnome.Papers.desktop
 org.gnome.Evince.desktop
 org.gnome.TextEditor.desktop
 !org.gnome.FileRoller.desktop

glib2-branding.changes

@@ -1,38 +1,3 @@
--------------------------------------------------------------------
-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>
-
-- Ensure flavor has a value, at least %nil.
-- ExclusiveArch: %nil is invalid: give it a value (do-not-build).
-
 -------------------------------------------------------------------
 Wed Apr 19 12:52:08 UTC 2023 - 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_DARK@@"
+picture-uri-dark = "@@WALLPAPER_URI@@"
-picture-options = "zoom"
+picture-options = "stretched"
-@@IF_openSUSE@@primary-color = "#63bbb2ff"
+@@IF_openSUSE@@primary-color = "#258c06"
-@@IF_openSUSE@@secondary-color = "#0c2a27ff"
+@@IF_openSUSE@@secondary-color = "#258c06"
 @@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 = "zoom"
+picture-options = "stretched"
-@@IF_openSUSE@@primary-color = "#63bbb2ff"
+@@IF_openSUSE@@primary-color = "#258c06"
-@@IF_openSUSE@@secondary-color = "#0c2a27ff"
+@@IF_openSUSE@@secondary-color = "#258c06"
 @@IF_SLE@@primary-color = "#0C322C"
 @@IF_SLE@@secondary-color = "#0C322C"
 @@IF_SLE@@lock-delay = 300
@@ -73,8 +73,6 @@ 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
+# spec file
 #
-# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,10 +16,10 @@
 #
 
 
-%define flavor @BUILD_FLAVOR@%{nil}
+%define flavor @BUILD_FLAVOR@
 %if "%{flavor}" == ""
 %define branding_name %{nil}
-ExclusiveArch:  do-not-build
+ExclusiveArch:  %{nil}
 %else
 %define branding_name %{flavor}
 %define dash -
@@ -30,7 +30,7 @@ ExclusiveArch:  do-not-build
 %endif
 %if (0%{?build_SLE} && 0%{?is_opensuse}) || (0%{?build_openSUSE} && ! 0%{?is_opensuse})
 # Don't build SLE branding on openSUSE and vice-versa
-ExclusiveArch:  do-not-build
+ExclusiveArch:  %{nil}
 %endif
 %endif
 %define gio_real_package %(rpm -q --qf '%%{name}' --whatprovides gio)
@@ -90,18 +90,8 @@ 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 | \