From bd324719997d3bb233484891ec73d73cd1670719 Mon Sep 17 00:00:00 2001
From: "Brian C. Lane" <bcl@redhat.com>
Date: Wed, 19 May 2021 09:35:21 -0700
Subject: [PATCH] Replace metacity with gnome-kiosk

Resolves: rhbz#1961099
---
 80-rhel/runtime-cleanup.tmpl | 4 ----
 80-rhel/runtime-install.tmpl | 3 ++-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/80-rhel/runtime-cleanup.tmpl b/80-rhel/runtime-cleanup.tmpl
index f9991ec..e2cc84a 100644
--- a/80-rhel/runtime-cleanup.tmpl
+++ b/80-rhel/runtime-cleanup.tmpl
@@ -113,7 +113,6 @@ removefrom gtk2-engines --allbut /usr/${libdir}/*/libclearlooks.so \
                                  /usr/share/themes/Clearlooks/*
 removefrom gtk3 /usr/${libdir}/gtk-3.0/*/printbackends/*
 removefrom gtk3 /usr/share/themes/*
-removefrom metacity --allbut /usr/bin/* /usr/${libdir}/* /etc/*
 
 ## filesystem tools
 removefrom e2fsprogs /usr/share/locale/*
@@ -362,6 +361,3 @@ removepkg geoclue2
 ## And remove the packages that those extra libraries pulled in
 removepkg cdparanoia-libs opus libtheora libvisual flac-libs gsm avahi-glib avahi-libs \
           ModemManager-glib
-
-## metacity requires libvorbis and libvorbisfile, but enc/dec are no longer needed
-removefrom libvorbis --allbut /usr/${libdir}/libvorbisfile.* /usr/${libdir}/libvorbis.*
diff --git a/80-rhel/runtime-install.tmpl b/80-rhel/runtime-install.tmpl
index 4740ca8..6306948 100644
--- a/80-rhel/runtime-install.tmpl
+++ b/80-rhel/runtime-install.tmpl
@@ -89,9 +89,10 @@ installpkg rsyslog
 installpkg xorg-x11-drivers xorg-x11-server-Xorg
 %endif
 installpkg xorg-x11-server-utils xorg-x11-xauth
-installpkg dbus-x11 metacity gsettings-desktop-schemas
+installpkg dbus-x11 gsettings-desktop-schemas
 installpkg nm-connection-editor
 installpkg librsvg2
+installpkg gnome-kiosk
 
 ## filesystem tools
 installpkg xfsprogs gfs2-utils