From c3fd9d79ab1515b1d30a069f3a3cfc4097385da0 Mon Sep 17 00:00:00 2001
From: "Ralf S. Engelschall" <rse@openpkg.org>
Date: Wed, 15 May 2002 12:48:23 +0000
Subject: [PATCH] fix backward compat stuff and rpm --fetch

---
 openpkg/openpkg.spec | 4 ++--
 openpkg/rpmmacros    | 4 ++--
 openpkg/rpmx.pl      | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/openpkg/openpkg.spec b/openpkg/openpkg.spec
index 9248138817..14f88ef3a2 100644
--- a/openpkg/openpkg.spec
+++ b/openpkg/openpkg.spec
@@ -39,8 +39,8 @@
 #   o any cc(1)
 
 #   the package version and release
-%define       V_openpkg 20020416
-%define       R_openpkg 20020416
+%define       V_openpkg 20020515
+%define       R_openpkg 20020515
 
 #   the used software versions
 %define       V_rpm     4.0.2
diff --git a/openpkg/rpmmacros b/openpkg/rpmmacros
index 5332a419d9..ce0ab87ac5 100644
--- a/openpkg/rpmmacros
+++ b/openpkg/rpmmacros
@@ -57,8 +57,8 @@
 #   backward compatibility (openpkg < 20020204)
 %l_fsusr                 %{l_musr}
 %l_fsgrp                 %{l_mgrp}
-%l_fsuid                 %{l_muid}
-%l_fsgid                 %{l_mgid}
+%l_npuid                 %{l_nuid}
+%l_npgid                 %{l_ngid}
 
 #   the two root directories
 %l_root_install          @l_prefix@
diff --git a/openpkg/rpmx.pl b/openpkg/rpmx.pl
index 11653ba771..36575580bb 100644
--- a/openpkg/rpmx.pl
+++ b/openpkg/rpmx.pl
@@ -537,11 +537,11 @@ sub op_fetch {
             if (-f "$local_srcdir/$remote_srcfile" or -f "$local_specdir/$remote_srcfile") {
                 #   source already on local filesystem
                 my $size;
-                if (-f "$srcdir/$srcfile") {
-                   $size = (stat("$srcdir/$srcfile"))[7];
+                if (-f "$local_srcdir/$remote_srcfile") {
+                    $size = (stat("$local_srcdir/$remote_srcfile"))[7];
                 }
                 else {
-                   $size = (stat("$specdir/$srcfile"))[7];
+                    $size = (stat("$local_specdir/$remote_srcfile"))[7];
                 }
                 if ($size > 1024*1024) {
                     $size = sprintf("%.1fMB", $size / (1024*1024));