Skip to content

Commit 6ab630c

Browse files
committed
Fix up clean_perl
1 parent c906ee5 commit 6ab630c

3 files changed

Lines changed: 13 additions & 9 deletions

File tree

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
NAME = spec-helper
2-
VERSION = 0.31.45
2+
VERSION = 0.31.46
33
SVNPATH = git@github.com:OpenMandrivaSoftware/spec-helper.git
44

55
SCRIPT_FILES = clean_files clean_perl check_elf_files \

NEWS

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
2018-03-29 Bernhard Rosenkraenzer <bero@lindev.ch> 0.31.46
2+
* Make clean_perl actually do something useful
3+
14
2018-03-29 Bernhard Rosenkraenzer <bero@lindev.ch> 0.31.45
25
* Add gprintify fix for newer perl versions from Mageia
36

clean_perl

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,19 @@ if [ ! -d "$RPM_BUILD_ROOT" ]; then
1010
exit 1
1111
fi
1212

13-
d="$RPM_BUILD_ROOT/usr/lib/perl5"
14-
15-
[ -d $d ] || exit 0
16-
17-
find $d -name ".packlist" | xargs rm -f
13+
perldirs="$RPM_BUILD_ROOT/usr/lib/perl5 $RPM_BUILD_ROOT/usr/lib64/perl5 $RPM_BUILD_ROOT/usr/share/perl5"
14+
d=""
15+
for i in $perldirs; do
16+
[ -d "$i" ] || continue
17+
d="$d $i"
18+
done
19+
[ -z "$d" ] && exit 0
1820

19-
# remove file alike /usr/lib/perl5/5.8.*/i386-linux-thread-multi/perllocal.pod
20-
perl -MConfig -e 'unlink "$ENV{RPM_BUILD_ROOT}$Config{installarchlib}/perllocal.pod"'
21+
find $d -name ".packlist" -o -name perllocal.pod | xargs rm -f
2122

2223
for i in $(find $d -name "*.bs"); do
2324
if [ -s $i ]; then
24-
echo "non empty .bs file, please mail rgarciasuarez@mandriva.com about this!"
25+
echo "non empty .bs file!"
2526
else
2627
rm -f $i
2728
fi

0 commit comments

Comments
 (0)