From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Sat, 26 Nov 2016 08:55:20 +0000 (+0100)
Subject: - include libx32 dirs (mostly x32 vendorarch) when generating perl dependencies
X-Git-Tag: auto/th/rpm-5.4.15-38
X-Git-Url: http://git.pld-linux.org/?p=packages%2Frpm.git;a=commitdiff_plain;h=d76b9ce2a410909a5ff9290ff79fbc65a3a62910

- include libx32 dirs (mostly x32 vendorarch) when generating perl dependencies
  note: all perl x32 (non-noarch) modules need rebuild with proper Requires generated...
- release 38
---

diff --git a/rpm-perl_req-INC_dirs.patch b/rpm-perl_req-INC_dirs.patch
index 163ce71..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 @@
diff --git a/rpm.spec b/rpm.spec
index 3e40f7a..8901531 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -51,7 +51,7 @@ Summary(ru.UTF-8):	Менеджер пакетов от RPM
 Summary(uk.UTF-8):	Менеджер пакетів від RPM
 Name:		rpm
 Version:	5.4.15
-Release:	37
+Release:	38
 License:	LGPL v2.1
 Group:		Base
 # http://rpm5.org/files/rpm/rpm-5.4/rpm-5.4.15-0.20140824.src.rpm