Fix find-requires (#443015)

This commit is contained in:
Bill Nottingham 2008-04-18 16:20:57 +00:00
parent 4ee23614a5
commit 172a33ecd1
2 changed files with 26 additions and 3 deletions

View File

@ -0,0 +1,20 @@
diff --git a/autodeps/linux.req b/autodeps/linux.req
index c0a0cc9..70f627d 100644
--- a/autodeps/linux.req
+++ b/autodeps/linux.req
@@ -105,6 +104,7 @@ for f in $liblist $exelist ; do
print $2 ;
}
}
+ (START==2) && /^[A-Za-z]/ { START=3; }
/^Version References:$/ { START=2; }
(START==2) && /required from/ {
sub(/:/, "", $3);
@@ -113,7 +113,6 @@ for f in $liblist $exelist ; do
(START==2) && (LIBNAME!="") && ($4!="") && (($4~/^GLIBC_*/) || ($4~/^GCC_*/)) {
print LIBNAME "(" $4 ")'$lib64'";
}
- /^[A-Za-z]/ { START=3; }
'
done | sort -u

View File

@ -6,7 +6,7 @@
Summary: The RPM package management system
Name: rpm
Version: 4.4.2.3
Release: 1%{?dist}
Release: 2%{?dist}
Group: System Environment/Base
Url: http://www.rpm.org/
Source: http://rpm.org/releases/rpm-4.4.x/%{name}-%{version}.tar.gz
@ -22,7 +22,7 @@ Patch9: rpm-4.4.2.2-autofoo.patch
Patch10: rpm-4.4.2.2-pkgconfig-path.patch
Patch11: rpm-4.4.2.3-queryformat-arch.patch
Patch12: rpm-4.4.2.3-no-order-rescan-limit.patch
Patch13: rpm-4.4.2.3-fix-find-requires.patch
Patch50: rpm-4.4.2.3-rc1-sparc-mcpu.patch
# XXX Beware, this is one murky license, partially GPL/LGPL dual-licensed
@ -147,7 +147,7 @@ that will manipulate RPM packages and databases.
%patch10 -p1 -b .pkgconfig-path
%patch11 -p1 -b .qfmt-arch
%patch12 -p1 -b .no-order-limit
%patch13 -p1 -b .requires
%patch50 -p1 -b .sparc-mcpu
# force external popt
@ -401,6 +401,9 @@ exit 0
%endif
%changelog
* Fri Apr 18 2008 Bill Nottingham <notting@redhat.com> 4.4.2.3-2
- fix find-requires (#443015)
* Tue Apr 01 2008 Panu Matilainen <pmatilai@redhat.com> 4.4.2.3-1
- update to 4.4.2.3 final
- resolves #436770, #431009, #435620, #433188, #430428, #432496