summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjbj <devnull@localhost>2002-05-26 18:40:25 +0000
committerjbj <devnull@localhost>2002-05-26 18:40:25 +0000
commitca60c30e3a048234fa3e6736d3145af6128b6f8c (patch)
tree128741688f56e28b09aa6307a7bd6c9151d261b3
parent3067a2c91dc0e85acab883e3fccc5caf15247d89 (diff)
downloadrpm-ca60c30e3a048234fa3e6736d3145af6128b6f8c.tar.gz
rpm-ca60c30e3a048234fa3e6736d3145af6128b6f8c.tar.bz2
rpm-ca60c30e3a048234fa3e6736d3145af6128b6f8c.zip
- fix: un-resurrect "()(64bit)" markings using objdump on i386.
CVS patchset: 5449 CVS date: 2002/05/26 18:40:25
-rw-r--r--autodeps/linux.req5
-rw-r--r--rpm.spec.in5
2 files changed, 7 insertions, 3 deletions
diff --git a/autodeps/linux.req b/autodeps/linux.req
index 23bc50752..16b568424 100644
--- 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 61c174293..b763f55a1 100644
--- 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.