- fix: un-resurrect "()(64bit)" markings using objdump on i386.

CVS patchset: 5449
CVS date: 2002/05/26 18:40:25

diff --git a/autodeps/linux.req b/autodeps/linux.req
index 23bc507..16b5684 100644 (file)
--- a/autodeps/linux.req
+++ b/autodeps/linux.req
@@ -98,8 +98,9 @@ for f in $liblist $exelist ; do
        /^Dynamic Section:$/ { START=1; }
        (START==1) && /NEEDED/ {
            if (needed) {
-               sub(/$/, "()'$mark64'", $2) ;
-               sub(/()$/, "", $2) ;
+               if ("'$lib64'" != "") {
+                   sub(/$/, "()'$lib64'", $2) ;
+               }
                print $2 ;
            }
        }

diff --git a/rpm.spec.in b/rpm.spec.in
index 61c1742..b763f55 100644 (file)
--- a/rpm.spec.in
+++ b/rpm.spec.in
@@ -17,7 +17,7 @@ Name: rpm
 %define version @VERSION@
 Version: %{version}
 %{expand: %%define rpm_version %{version}}
-Release: 0.16
+Release: 0.17
 Group: System Environment/Base
 Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/rpm-%{rpm_version}.tar.gz
 Copyright: GPL
@@ -515,6 +515,9 @@ fi
 %{__prefix}/include/popt.h
 
 %changelog
+* Sun May 26 2002 Jeff Johnson <jbj@redhat.com> 4.1-0.17
+- fix: un-resurrect "()(64bit)" markings using objdump on i386.
+
 * Fri May 24 2002 Jeff Johnson <jbj@redhat.com> 4.1-0.16
 - add rpmds/rpmfi/rpmts methods to bindings.
 - re-enable rpm-python sub-package.