Merge branch 'rpm.org'

diff --cc rpm.spec
index 40cbcac8d66ef3fd19ecafd44c2c881c3167a5ff,c3257aad2b5892b654b7cb9c3dfc9b633066fb84..9d182e623b30283d7728836151edc4fc1229d59c
--- 1/rpm.spec
--- 2/rpm.spec
+++ b/rpm.spec
@@@ -1349,63 -822,58 +822,61 @@@ find %{_rpmlibdir} -name '*-linux' -typ
  %lang(sk) %{_mandir}/sk/man8/rpm.8*
  
  %dir /var/lib/rpm
- %dir /var/lib/rpm/log
- %dir /var/lib/rpm/tmp
- %config(noreplace) %verify(not md5 mtime size) /var/lib/rpm/DB_CONFIG
- %dir %attr(700,root,root) /var/spool/repackage
- %dir /var/lock/rpm
- /var/lock/rpm/transaction
- 
- # exported package NVRA (stamped with install tid)
- # net-snmp hrSWInstalledName queries, bash-completions
- %dir /var/cache/hrmib
- 
- %{_rpmlibdir}/qf
+ %ghost %config(missingok,noreplace) /var/lib/rpm/*
+ %ghost /var/lib/rpm/.*.lock
+ 
  %{_rpmlibdir}/rpmpopt*
+ %{_rpmlibdir}/rpmrc
  %{_rpmlibdir}/macros
  %dir %{_rpmlibdir}/macros.d
- %{_rpmlibdir}/macros.d/pld
- %dir %{_rpmlibdir}/pld
- %{_rpmlibdir}/cpuinfo.yaml
- %{_rpmlibdir}/noarch-*
+ %dir %{_rpmlibdir}/platform
+ %{_rpmlibdir}/platform/noarch-*
  %ifarch %{ix86} %{x8664} x32
- %{_rpmlibdir}/i?86*
- %{_rpmlibdir}/pentium*
- %{_rpmlibdir}/athlon*
+ %{_rpmlibdir}/platform/athlon*
+ %{_rpmlibdir}/platform/geode*
+ %{_rpmlibdir}/platform/i?86*
+ %{_rpmlibdir}/platform/pentium*
+ %endif
+ %ifarch %{x8664} x32
+ %{_rpmlibdir}/platform/amd64*
+ %{_rpmlibdir}/platform/ia32e*
+ %{_rpmlibdir}/platform/x86_64*
+ %{_rpmlibdir}/platform/x32*
  %endif
  %ifarch alpha
- %{_rpmlibdir}/alpha*
+ %{_rpmlibdir}/platform/alpha*
+ %endif
+ %ifarch aarch64
+ %{_rpmlibdir}/platform/aarch64*
+ %endif
+ %ifarch %{arm}
+ %{_rpmlibdir}/platform/arm*
  %endif
 +%ifarch aarch64
 +%{_rpmlibdir}/aarch64*
 +%endif
  %ifarch ia64
- %{_rpmlibdir}/ia64*
+ %{_rpmlibdir}/platform/ia64*
  %endif
  %ifarch mips mipsel mips64 mips64el
- %{_rpmlibdir}/mips*
+ %{_rpmlibdir}/platform/mips*
  %endif
  %ifarch %{ppc}
- %{_rpmlibdir}/ppc*
+ %{_rpmlibdir}/platform/ppc*
  %endif
  %ifarch sparc sparc64
- %{_rpmlibdir}/sparc*
- %endif
- %ifarch %{x8664} x32
- %{_rpmlibdir}/amd64*
- %{_rpmlibdir}/ia32e*
- %{_rpmlibdir}/x86_64*
- %{_rpmlibdir}/x32*
+ %{_rpmlibdir}/platform/sparc*
  %endif
  
- %attr(755,root,root) %{_rpmlibdir}/hrmib-cache
+ %dir %{_rpmlibdir}/pld
+ 
+ %attr(755,root,root) %{_rpmlibdir}/rpmdb_dump
+ %attr(755,root,root) %{_rpmlibdir}/rpmdb_load
+ 
+ # valgrind suppression file for rpm
+ %{_rpmlibdir}/rpm.supp
  
- %dir %{_rpmlibdir}/bin
- %attr(755,root,root) %{_rpmlibdir}/bin/dbconvert
- %attr(755,root,root) %{_rpmlibdir}/bin/dbupgrade.sh
- %attr(755,root,root) %{_rpmlibdir}/bin/rpmdb_checkversion
- %attr(755,root,root) %{_rpmlibdir}/bin/rpmdb_reset
- %attr(755,root,root) %{_rpmlibdir}/bin/rpmdbchk
+ %dir /usr/lib/.build-id
  
  %files base
  %defattr(644,root,root,755)