From bbc87762b907b0ee02333c2af3245239962ae816e4808afabf382fbbbdc93cb7 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 22 Sep 2020 09:03:12 +0000 Subject: [PATCH] Accepting request 835426 from home:fcrozat:branches:GNOME:Factory - Update .gschema.override.in (jsc#SLE-14772): * add different key for screenlock * update background color for SLE. OBS-URL: https://build.opensuse.org/request/show/835426 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/glib2-branding?expand=0&rev=24 --- glib2-branding.changes | 7 +++++++ glib2-branding.gschema.override.in | 15 ++++++++++----- glib2-branding.spec | 4 ++-- 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/glib2-branding.changes b/glib2-branding.changes index 5cbd9ab..7657672 100644 --- a/glib2-branding.changes +++ b/glib2-branding.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Sep 18 12:36:04 UTC 2020 - Frederic Crozat + +- Update .gschema.override.in (jsc#SLE-14772): + * add different key for screenlock + * update background color for SLE. + ------------------------------------------------------------------- Mon May 18 14:12:32 UTC 2020 - Dominique Leuenberger diff --git a/glib2-branding.gschema.override.in b/glib2-branding.gschema.override.in index 0f1e2b6..6d355df 100644 --- a/glib2-branding.gschema.override.in +++ b/glib2-branding.gschema.override.in @@ -12,14 +12,19 @@ toolkit-accessibility = false ## Default wallpaper picture-uri = "@@WALLPAPER_URI@@" picture-options = "stretched" -primary-color = "#258c06" -secondary-color = "#258c06" +@@IF_openSUSE@@primary-color = "#258c06" +@@IF_openSUSE@@secondary-color = "#258c06" +@@IF_SLE@@primary-color = "#0C322C" +@@IF_SLE@@secondary-color = "#0C322C" [org.gnome.desktop.screensaver] -picture-uri = "@@WALLPAPER_URI@@" +@@IF_openSUSE@@picture-uri = "@@WALLPAPER_URI@@" +@@IF_SLE@@picture-uri = "@@LOCKSCREEN_URI@@" picture-options = "stretched" -primary-color = "#258c06" -secondary-color = "#258c06" +@@IF_openSUSE@@primary-color = "#258c06" +@@IF_openSUSE@@secondary-color = "#258c06" +@@IF_SLE@@primary-color = "#0C322C" +@@IF_SLE@@secondary-color = "#0C322C" @@IF_SLE@@lock-delay = 300 [org.gnome.login-screen] diff --git a/glib2-branding.spec b/glib2-branding.spec index 03da41d..c734462 100644 --- a/glib2-branding.spec +++ b/glib2-branding.spec @@ -1,5 +1,5 @@ # -# spec file for package glib2-branding +# spec file for package glib2 # # Copyright (c) 2020 SUSE LLC # @@ -91,7 +91,7 @@ cp -a %{SOURCE2} glib2-branding.gschema.override.in %build test -f %{_datadir}/wallpapers/%{branding_name}-default.xml -sed "s,@@WALLPAPER_URI@@,file://%{_datadir}/wallpapers/%{branding_name}-default.xml," glib2-branding.gschema.override.in > glib2-branding.gschema.override +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 #for sound theme %if 0%{?build_openSUSE} sed "s:@@IF_openSUSE@@::g" < glib2-branding.gschema.override | \