diff --git a/glib2-branding.changes b/glib2-branding.changes index 0f50e89..3dcbdd2 100644 --- a/glib2-branding.changes +++ b/glib2-branding.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Tue Oct 1 19:32:14 UTC 2024 - Lubos Kocman + +- 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 diff --git a/glib2-branding.gschema.override.in b/glib2-branding.gschema.override.in index a190e2c..82acffa 100644 --- a/glib2-branding.gschema.override.in +++ b/glib2-branding.gschema.override.in @@ -11,19 +11,20 @@ toolkit-accessibility = false [org.gnome.desktop.background] ## Default wallpaper picture-uri = "@@WALLPAPER_URI@@" -picture-uri-dark = "@@WALLPAPER_URI@@" -picture-options = "stretched" -@@IF_openSUSE@@primary-color = "#258c06" -@@IF_openSUSE@@secondary-color = "#258c06" +picture-uri-dark = "@@WALLPAPER_URI_DARK@@" +picture-options = "zoom" +@@IF_openSUSE@@primary-color = "#63bbb2ff" +@@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_openSUSE@@picture-uri-dark = "@@WALLPAPER_URI_DARK@@" @@IF_SLE@@picture-uri = "@@LOCKSCREEN_URI@@" -picture-options = "stretched" -@@IF_openSUSE@@primary-color = "#258c06" -@@IF_openSUSE@@secondary-color = "#258c06" +picture-options = "zoom" +@@IF_openSUSE@@primary-color = "#63bbb2ff" +@@IF_openSUSE@@secondary-color = "#0c2a27ff" @@IF_SLE@@primary-color = "#0C322C" @@IF_SLE@@secondary-color = "#0C322C" @@IF_SLE@@lock-delay = 300 diff --git a/glib2-branding.spec b/glib2-branding.spec index 670893b..b4699d4 100644 --- a/glib2-branding.spec +++ b/glib2-branding.spec @@ -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 | \