Description of Problem:

The install of the rpm package is broken after an upgrade from Red Hat 7.2
to 8.0


Version-Release number of selected component (if applicable):
rpm-4.1-1.06

How Reproducible:

Steps to Reproduce:
1. Upgrade from RH 7.2 to 8.0
2. type  rpm -V rpm
3. 

Actual Results:
inconsistencies  (L, symlink) are reported on 
/usr/lib/rpm/i[3456]86-linux  and
/usr/lib/rpm/noarch-linux
and on /usr/lib/rpm/i386-linux/macros  (size, MD5 sum)

Expected Results:
No message (no news=good news)

Additional Information:
I think the cause of the problem is this: 
under RH 7.2, there are symlink from 
/usr/lib/rpm/i?86-linux to /usr/lib/rpm/i?86-redhat-linux
AND FROM /usr/lib/rpm/noarch-linux to /usr/lib/rpm/i386-redhat-linux
rpm-4.1 expects directories, but the upgrade does not remove the 
symlinks, it just writes its files where it thinks they should go. 
So they end up in i?86-redhat-linux and (worst of all) the file
noarch-linux/macros overwrites the file from i386-linux/macros

To make this go away, I had to remove the symlinks by hand and 
rpm -Uvh --force rpm-4.1-1.06.i386.rpm