From ec0c28a0856f940ce04af0f57051fec1a9480c12 Mon Sep 17 00:00:00 2001
From: "Brian C. Lane" <bcl@redhat.com>
Date: Thu, 14 Nov 2024 16:09:09 -0800
Subject: [PATCH] runtime-cleanup: Newer glibc installs /usr/sbin/ldconfig

Prepare for this change so that it isn't unexpectedly deleted.
Also clean up some removal entries for files that are no longer
installed.

Resolves: RHEL-69011
---
 80-rhel/runtime-cleanup.tmpl | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/80-rhel/runtime-cleanup.tmpl b/80-rhel/runtime-cleanup.tmpl
index 897bcac..8cd2fab 100644
--- a/80-rhel/runtime-cleanup.tmpl
+++ b/80-rhel/runtime-cleanup.tmpl
@@ -185,19 +185,17 @@ removefrom gdisk /usr/share/*
 removefrom gdk-pixbuf2 /usr/share/locale*
 removefrom glib2 /etc/* /usr/bin/* /usr/share/locale/*
 removefrom glibc /etc/gai.conf /etc/localtime /etc/rpc
-removefrom glibc /lib/*/nosegneg/* /${libdir}/libBrokenLocale*
-removefrom glibc /${libdir}/libSegFault* /${libdir}/libanl*
-removefrom glibc /${libdir}/libcidn* /${libdir}/libnss_compat*
-removefrom glibc /${libdir}/libnss_hesiod* /${libdir}/libnss_nis*
+removefrom glibc */${libdir}/libBrokenLocale*
+removefrom glibc */${libdir}/libSegFault* */${libdir}/libanl*
+removefrom glibc */${libdir}/libnss_compat*
 # python-pyudev uses ctypes.util.find_library, which uses /sbin/ldconfig
-removefrom glibc /${libdir}/rtkaio* /sbin/sln
-removefrom glibc /usr/libexec/* /usr/sbin/*
+removefrom glibc /usr/libexec/* /usr/*bin/iconvconfig
 removefrom glibc-common /etc/* /usr/bin/catchsegv /usr/bin/gencat
 removefrom glibc-common /usr/bin/getent
-removefrom glibc-common /usr/bin/locale /usr/bin/rpcgen /usr/bin/sprof
+removefrom glibc-common /usr/bin/locale /usr/bin/sprof
 # NB: we keep /usr/bin/localedef so anaconda can inspect payload locale info
-removefrom glibc-common /usr/bin/tzselect
-removefrom glibc-common /usr/libexec/* /usr/sbin/*
+removefrom glibc-common pusr/bin/tzselect
+removefrom glibc-common /usr/*bin/zic
 removefrom gmp /usr/${libdir}/libgmpxx.* /usr/${libdir}/libmp.*
 removefrom gnome-bluetooth-libs /usr/${libdir}/libgnome-bluetooth*
 removefrom gnome-bluetooth-libs /usr/share/*