X-Git-Url: http://git.pld-linux.org/?p=packages%2Frpm.git;a=blobdiff_plain;f=rpm-perl_req-INC_dirs.patch;h=c6db3cdedcf2d58f46df044dc8620af2ce497d79;hp=c6a28f2a42751c53aaafd367e8fddbe0f28ad960;hb=d76b9ce2a410909a5ff9290ff79fbc65a3a62910;hpb=779126cb9a69ef666e07e3a4f47fa82986ef5b14 diff --git a/rpm-perl_req-INC_dirs.patch b/rpm-perl_req-INC_dirs.patch index c6a28f2..c6db3cd 100644 --- a/rpm-perl_req-INC_dirs.patch +++ b/rpm-perl_req-INC_dirs.patch @@ -19,7 +19,7 @@ - if (m=/usr/(sbin|bin|lib|share|X11R6/(lib|bin))/=) { + chomp; + $inc{$1}++ if m#($inc)/#; # can't anchor on ^ -+ if (m=/usr/(sbin|bin|lib|lib64|share|X11R6/(lib|lib64|bin))/=) { ++ if (m=/usr/(sbin|bin|lib|lib64|libx32|share|X11R6/(lib|lib64|libx32|bin))/=) { if (! m=(/(doc|man|info|usr/src)/|\.(so|ph|h|html|pod)$)=) { process_file($_) if -f; @@ -53,8 +64,9 @@ @@ -29,7 +29,7 @@ +print "$_\n" for sort grep $inc{$_}, keys %inc; -foreach $module (sort keys %require) { -+foreach my $module (sort keys %require) { ++foreach my $module (sort grep length, keys %require) { if (length($require{$module}) == 0) { if ($module =~ /^[0-9._]+$/) { print "perl-base >= $module\n";