From 7dea69eca468e7a8e9b2c61539731f905a5c4c2c Mon Sep 17 00:00:00 2001 From: Alexey Tourbin Date: Fri, 21 Oct 2011 01:26:58 +0400 Subject: [PATCH] brp-cleanup: perl cleanup routines moved to rpm-build-perl --- rpm-4_0.spec | 2 +- scripts/brp-cleanup.in | 22 ++++------------------ 2 files changed, 5 insertions(+), 19 deletions(-) diff --git a/rpm-4_0.spec b/rpm-4_0.spec index 18a9d26..733838c 100644 --- a/rpm-4_0.spec +++ b/rpm-4_0.spec @@ -113,7 +113,7 @@ Requires: alternatives >= 0.3.2 Requires: elfutils >= 0.143-alt1 Requires: info-install >= 4.11 Requires: pkgconfig-reqprov pkgconfig-recursion -Requires: rpm-build-perl >= 0.6.2 +Requires: rpm-build-perl >= 0.76 Requires: rpm-build-python >= 0.31 Conflicts: rpm-build-tcl <= 0.2 Conflicts: rpm-build-mono <= 1.0 diff --git a/scripts/brp-cleanup.in b/scripts/brp-cleanup.in index 502e185..d343596 100755 --- a/scripts/brp-cleanup.in +++ b/scripts/brp-cleanup.in @@ -84,21 +84,7 @@ s,\([[:space:]]\)required[[:space:]]\+pam_stack.so[[:space:]]\+service=,\1substa ' -- fi -# All the rest is perl cleanup stuff. - -set -- ./usr/*/perl5/ -[ -d "$1" ] || exit 0 - -find "$@" -type f -name .packlist -print0 | - xargs -r0 rm -vf -- - -find "$@" -type f -name \*.bs -size 0 -print0 | - xargs -r0 rm -vf -- - -f="$(find "$@" -type f -name \*.bs)" -if [ -n "$f" ]; then - echo "$PROG: non empty *.bs file(s) found:" - printf %s\\n "$f" - echo "$PROG: please contact packager" - exit 1 -fi +# Run ancillary cleanup methods. +for f in @RPMCONFIGDIR@/*.clean; do + "$f" +done