- perlprov-regonly patch: check for perl requirements only in regular files

  (fixes also case of symlinks unresolvable in DESTDIR, in subpackage etc.)
- release 47, STBR

Changed files:
    rpm-perlprov-regonly.patch -> 1.1
    rpm.spec -> 1.270

diff --git a/rpm-perlprov-regonly.patch b/rpm-perlprov-regonly.patch
new file mode 100644 (file)
index 0000000..0e691fb
--- /dev/null
+++ b/rpm-perlprov-regonly.patch
@@ -0,0 +1,42 @@
+diff -Nur rpm-4.0.2.orig/scripts/perl.prov rpm-4.0.2/scripts/perl.prov
+--- rpm-4.0.2.orig/scripts/perl.prov   Thu Jan 24 15:17:27 2002
++++ rpm-4.0.2/scripts/perl.prov        Thu Jan 24 16:04:16 2002
+@@ -48,7 +48,7 @@
+ if ("@ARGV") {
+   foreach (@ARGV) {
+      if (! m=(/(doc|usr/src)/|\.(so|gz|ph|pod|h|html)$)=) {
+-      process_file($_);
++      process_file($_) if -f "$_";
+     }
+   }
+ } else {
+@@ -58,7 +58,7 @@
+ 
+   foreach (<>) {
+      if (! m=(/(doc|usr/src)/|\.(so|gz|ph|pod|h|html)$)=) {
+-      process_file($_);
++      process_file($_) if -f "$_";
+     }
+   }
+ }
+diff -Nur rpm-4.0.2.orig/scripts/perl.req rpm-4.0.2/scripts/perl.req
+--- rpm-4.0.2.orig/scripts/perl.req    Thu Jan 24 15:17:27 2002
++++ rpm-4.0.2/scripts/perl.req Thu Jan 24 16:04:53 2002
+@@ -43,7 +43,7 @@
+   foreach (@ARGV) {
+     if (m=/usr/(sbin|bin|lib|share|X11R6/(lib|bin))/=) {
+       if (! m=(/(doc|man|info|usr/src)/|\.(so|ph|h|html|pod)$)=) {
+-        process_file($_);
++        process_file($_) if -f "$_";
+       }
+     }
+   }
+@@ -55,7 +55,7 @@
+   foreach (<>) {
+      if (m=/usr/(sbin|bin|lib|share|X11R6/(lib|bin))/=) {
+        if (! m=(/(doc|man|info|usr/src)/|\.(so|ph|h|html|pod)$)=) {
+-         process_file($_);
++         process_file($_) if -f "$_";
+        }
+      }
+   }

diff --git a/rpm.spec b/rpm.spec
index 94caee7bde7f227c6fe61261cb39800c0464eb27..a947712cf8b3906e232fd62ea430548725976f3d 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -3,7 +3,7 @@ Summary(de):    Red Hat (und jetzt auch PLD) Packet-Manager
 Summary(pl):   Aplikacja do zarz±dzania pakietami
 Name:          rpm
 Version:       4.0.2
-Release:       46
+Release:       47
 License:       GPL
 Group:         Base
 Group(de):     Gründsätzlich
@@ -52,6 +52,7 @@ Patch24:      %{name}-progress-nontty.patch
 Patch25:       %{name}-am_ac.patch
 Patch26:       %{name}-python-macros.patch
 Patch27:       %{name}-hardlink-fixes.patch
+Patch28:       %{name}-perlprov-regonly.patch
 Patch37:        %{name}-short_circuit.patch
 Patch38:        %{name}-section_test.patch
 URL:           http://www.rpm.org/
@@ -304,6 +305,7 @@ construir pacotes usando o RPM.
 %patch25 -p1
 %patch26 -p0
 %patch27 -p1
+%patch28 -p1
 %patch31 -p1
 %patch36 -p1
 %patch37 -p1