- include libx32 dirs (mostly x32 vendorarch) when generating perl dependencies

[packages/rpm.git] / rpm-perl_req-INC_dirs.patch

diff --git a/rpm-perl_req-INC_dirs.patch b/rpm-perl_req-INC_dirs.patch
index 1fa9a965fcf52e5dfb2c5e660dd3eff237d32671..c6db3cdedcf2d58f46df044dc8620af2ce497d79 100644 (file)
--- a/rpm-perl_req-INC_dirs.patch
+++ b/rpm-perl_req-INC_dirs.patch
@@ -16,9 +16,10 @@
 +
  foreach ( @ARGV ? @ARGV : <> ) {
 -      chomp;
+-    if (m=/usr/(sbin|bin|lib|share|X11R6/(lib|bin))/=) {
 +    chomp;
-+    $inc{$1}++ if m#^($inc)/#;
-     if (m=/usr/(sbin|bin|lib|share|X11R6/(lib|bin))/=) {
++    $inc{$1}++ if m#($inc)/#;  # can't anchor on ^
++    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 @@
@@ -28,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";