From bc7f33191d7724e91e97daab95d9171c9d70c859 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 16 May 2023 09:16:24 +0000 Subject: [PATCH] import gnome-session-3.28.1-20.el8_8 --- ...at.KioskWithKeyboard.WindowManager.desktop | 4 +-- SOURCES/com.redhat.KioskWithKeyboard.desktop | 2 +- SOURCES/redhat-kiosk | 2 +- SOURCES/redhat-kiosk.dconf.profile | 2 +- SPECS/gnome-session.spec | 28 ++++++++++++++----- 5 files changed, 26 insertions(+), 12 deletions(-) diff --git a/SOURCES/com.redhat.KioskWithKeyboard.WindowManager.desktop b/SOURCES/com.redhat.KioskWithKeyboard.WindowManager.desktop index feeae1d..9a89de7 100644 --- a/SOURCES/com.redhat.KioskWithKeyboard.WindowManager.desktop +++ b/SOURCES/com.redhat.KioskWithKeyboard.WindowManager.desktop @@ -1,8 +1,8 @@ [Desktop Entry] Type=Application -Name=Mutter +Name=GNOME Shell Kiosk Mode Comment=Window manager -Exec=env DCONF_PROFILE=redhat-kiosk /usr/bin/gnome-shell --mode=redhat-kiosk +Exec=env DCONF_PROFILE=redhatkiosk /usr/bin/gnome-shell --mode=redhat-kiosk Categories=GNOME;GTK;Core; OnlyShowIn=GNOME; NoDisplay=true diff --git a/SOURCES/com.redhat.KioskWithKeyboard.desktop b/SOURCES/com.redhat.KioskWithKeyboard.desktop index ef51dba..b4da81d 100644 --- a/SOURCES/com.redhat.KioskWithKeyboard.desktop +++ b/SOURCES/com.redhat.KioskWithKeyboard.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Name=Kiosk (with on-screen keyboard) Comment=Kiosk mode with on-screen keyboard -Exec=/usr/bin/env DCONF_PROFILE=redhat-kiosk /usr/bin/gnome-session --session=redhat-kiosk-with-keyboard +Exec=/usr/bin/env DCONF_PROFILE=redhatkiosk /usr/bin/gnome-session --session=redhat-kiosk-with-keyboard DesktopNames=Red-Hat-Kiosk;GNOME; diff --git a/SOURCES/redhat-kiosk b/SOURCES/redhat-kiosk index b42b293..8c11bfd 100755 --- a/SOURCES/redhat-kiosk +++ b/SOURCES/redhat-kiosk @@ -23,7 +23,7 @@ EOF touch ~/.config/gnome-initial-setup-done fi -export DCONF_PROFILE=redhat-kiosk +export DCONF_PROFILE=redhatkiosk systemctl --user import-environment DCONF_PROFILE exec ~/.local/bin/redhat-kiosk "$@" diff --git a/SOURCES/redhat-kiosk.dconf.profile b/SOURCES/redhat-kiosk.dconf.profile index 3dd2907..3cb5276 100644 --- a/SOURCES/redhat-kiosk.dconf.profile +++ b/SOURCES/redhat-kiosk.dconf.profile @@ -1,5 +1,5 @@ user-db:user -system-db:redhat-kiosk +system-db:redhatkiosk system-db:local system-db:site system-db:distro diff --git a/SPECS/gnome-session.spec b/SPECS/gnome-session.spec index 76aca8e..5b6ef82 100644 --- a/SPECS/gnome-session.spec +++ b/SPECS/gnome-session.spec @@ -9,7 +9,7 @@ Name: gnome-session Version: 3.28.1 -Release: 19%{?dist} +Release: 20%{?dist} Summary: GNOME session manager License: GPLv2+ @@ -164,9 +164,9 @@ install -D $RPM_SOURCE_DIR/redhat-kiosk -t $RPM_BUILD_ROOT%{_bindir} install -D $RPM_SOURCE_DIR/20-redhat-kiosk.conf -t $RPM_BUILD_ROOT%{_datadir}/X11/xorg.conf.d -install -D $RPM_SOURCE_DIR/50-redhat-kiosk.dconf $RPM_BUILD_ROOT%{_sysconfdir}/dconf/db/redhat-kiosk.d/50-redhat-kiosk -install -D $RPM_SOURCE_DIR/50-redhat-kiosk.dconf.locks $RPM_BUILD_ROOT%{_sysconfdir}/dconf/db/redhat-kiosk.d/locks/50-redhat-kiosk -install -D $RPM_SOURCE_DIR/redhat-kiosk.dconf.profile $RPM_BUILD_ROOT%{_sysconfdir}/dconf/profile/redhat-kiosk +install -D $RPM_SOURCE_DIR/50-redhat-kiosk.dconf $RPM_BUILD_ROOT%{_sysconfdir}/dconf/db/redhatkiosk.d/50-redhat-kiosk +install -D $RPM_SOURCE_DIR/50-redhat-kiosk.dconf.locks $RPM_BUILD_ROOT%{_sysconfdir}/dconf/db/redhatkiosk.d/locks/50-redhat-kiosk +install -D $RPM_SOURCE_DIR/redhat-kiosk.dconf.profile $RPM_BUILD_ROOT%{_sysconfdir}/dconf/profile/redhatkiosk install -D $RPM_SOURCE_DIR/20-redhat-kiosk.conf -t $RPM_BUILD_ROOT%{_datadir}/X11/xorg.conf.d @@ -175,6 +175,12 @@ install -D $RPM_SOURCE_DIR/20-redhat-kiosk.conf -t $RPM_BUILD_ROOT%{_datadir}/X1 %ldconfig_scriptlets %posttrans + +# These files weren't packaged correctly in gnome-session-3.28.1-19.el8 so manually prune them +rmdir %{_sysconfdir}/dconf/db/redhat-kiosk.d/locks 2> /dev/null || : +rmdir %{_sysconfdir}/dconf/db/redhat-kiosk.d 2> /dev/null || : +rm -f %{_sysconfdir}/dconf/db/redhat-kiosk 2> /dev/null || : + dconf update %files xsession @@ -185,9 +191,12 @@ dconf update %{_datadir}/wayland-sessions/* %files kiosk-session -%{_sysconfdir}/dconf/db/redhat-kiosk.d/50-redhat-kiosk -%{_sysconfdir}/dconf/db/redhat-kiosk.d/locks/50-redhat-kiosk -%{_sysconfdir}/dconf/profile/redhat-kiosk +%dir %{_sysconfdir}/dconf/db/redhatkiosk.d/locks +%dir %{_sysconfdir}/dconf/db/redhatkiosk.d +%ghost %{_sysconfdir}/dconf/db/redhatkiosk +%{_sysconfdir}/dconf/db/redhatkiosk.d/50-redhat-kiosk +%{_sysconfdir}/dconf/db/redhatkiosk.d/locks/50-redhat-kiosk +%{_sysconfdir}/dconf/profile/redhatkiosk %{_datadir}/applications/com.redhat.Kiosk.Script.desktop %{_datadir}/applications/com.redhat.Kiosk.WindowManager.desktop %{_datadir}/applications/com.redhat.KioskWithKeyboard.WindowManager.desktop @@ -215,6 +224,11 @@ dconf update %{_datadir}/glib-2.0/schemas/org.gnome.SessionManager.gschema.xml %changelog +* Wed Mar 01 2023 Ray Strode - 3.28.1-20 +- Work around dconf log spew by renaming dconf profile + Related: 2070976 + Resolves: #2175124 + * Tue Feb 28 2023 Ray Strode - 3.28.1-19 - Another fix Related: #2070976