import gnome-session-3.28.1-20.el8_8

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

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;
 

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 "$@"

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

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 <rstrode@redhat.com> - 3.28.1-20
+- Work around dconf log spew by renaming dconf profile
+  Related: 2070976
+  Resolves: #2175124
+
 * Tue Feb 28 2023 Ray Strode <rstrode@redhat.com> - 3.28.1-19
 - Another fix
   Related: #2070976