diff --git a/scripts/brp-cleanup.in b/scripts/brp-cleanup.in index b022c96..d7c1055 100755 --- a/scripts/brp-cleanup.in +++ b/scripts/brp-cleanup.in @@ -63,8 +63,14 @@ find .$RPM_CLEANUP_TOPDIR -type f \( \ find .$RPM_CLEANUP_TOPDIR -type d -name CVS -print0 | xargs -r0 rm -vrf -- -if cd ./etc/pam.d >/dev/null 2>&1; then - find -type f -mindepth 1 -maxdepth 1 -print0 | +for d in ./lib ./usr/lib ./usr/X11R6/lib; do + [ -d "$d" ] || continue + find "$d" -type f -mindepth 1 -maxdepth 1 -name 'lib*.la' -print0 | + xargs -r0 rm -fv -- +done + +if [ -d ./etc/pam.d ]; then + find ./etc/pam.d -type f -mindepth 1 -maxdepth 1 -print0 | xargs -r0 subst -p ' s,^\(#\?\)auth[[:space:]]\+,\1auth ,g s,^\(#\?\)account[[:space:]]\+,\1account ,g @@ -75,12 +81,6 @@ s,\([[:space:]]\)required[[:space:]]\+pam_stack.so[[:space:]]\+service=,\1includ ' -- fi -for d in ./lib ./usr/lib ./usr/X11R6/lib; do - [ -d "$d" ] || continue - find "$d" -type f -mindepth 1 -maxdepth 1 -name 'lib*.la' -print0 | - xargs -r0 rm -fv -- -done - # All the rest is perl cleanup stuff. cd ./usr/lib/perl5 >/dev/null 2>&1 || exit 0