- 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 163ce710db176c77a38340aaa36541d1472e2575..c6db3cdedcf2d58f46df044dc8620af2ce497d79 100644 (file)
--- 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|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 @@
        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 3e40f7acc5bc8af56f299b0b85ac28294cd43fdf..8901531eef2e093400b286ce36eaa59c370f0769 100644 (file)
--- 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
 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
 License:       LGPL v2.1
 Group:         Base
 # http://rpm5.org/files/rpm/rpm-5.4/rpm-5.4.15-0.20140824.src.rpm