1 files changed, 135 insertions, 143 deletions

diff --git a/archivers/rpm4/pkg-plist b/archivers/rpm4/pkg-plist
index 20f369585201..d7eb9060efd9 100644
--- a/archivers/rpm4/pkg-plist
+++ b/archivers/rpm4/pkg-plist
@@ -10,9 +10,6 @@ bin/rpmquery
 bin/rpmsign
 bin/rpmspec
 bin/rpmverify
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/rpm/__init__.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/rpm/_rpm.so
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/rpm/transaction.py
 include/rpm/argv.h
 include/rpm/header.h
 include/rpm/rpmarchive.h
@@ -28,7 +25,7 @@ include/rpm/rpmfiles.h
 include/rpm/rpmfileutil.h
 include/rpm/rpmio.h
 include/rpm/rpmkeyring.h
-include/rpm/rpmlib.h
+include/rpm/rpm%%LUA_LIBDIR%%.h
 include/rpm/rpmlog.h
 include/rpm/rpmmacro.h
 include/rpm/rpmpgp.h
@@ -48,143 +45,138 @@ include/rpm/rpmts.h
 include/rpm/rpmtypes.h
 include/rpm/rpmurl.h
 include/rpm/rpmutil.h
-lib/librpm.so
-lib/librpm.so.9
-lib/librpm.so.9.0.1
-lib/librpmbuild.so
-lib/librpmbuild.so.9
-lib/librpmbuild.so.9.0.1
-lib/librpmio.so
-lib/librpmio.so.9
-lib/librpmio.so.9.0.1
-lib/librpmsign.so
-lib/librpmsign.so.9
-lib/librpmsign.so.9.0.1
-lib/rpm/brp-compress
-lib/rpm/brp-java-gcjcompile
-lib/rpm/brp-python-bytecompile
-lib/rpm/brp-python-hardlink
-lib/rpm/brp-strip
-lib/rpm/brp-strip-comment-note
-lib/rpm/brp-strip-shared
-lib/rpm/brp-strip-static-archive
-lib/rpm/check-buildroot
-lib/rpm/check-files
-lib/rpm/check-prereqs
-lib/rpm/check-rpaths
-lib/rpm/check-rpaths-worker
-lib/rpm/config.guess
-lib/rpm/config.sub
-lib/rpm/debuginfo.prov
-lib/rpm/desktop-file.prov
-lib/rpm/fileattrs/debuginfo.attr
-lib/rpm/fileattrs/desktop.attr
-lib/rpm/fileattrs/elf.attr
-lib/rpm/fileattrs/font.attr
-lib/rpm/fileattrs/libtool.attr
-lib/rpm/fileattrs/metainfo.attr
-lib/rpm/fileattrs/ocaml.attr
-lib/rpm/fileattrs/perl.attr
-lib/rpm/fileattrs/perllib.attr
-lib/rpm/fileattrs/pkgconfig.attr
-lib/rpm/fileattrs/python.attr
-lib/rpm/fileattrs/pythondist.attr
-lib/rpm/fileattrs/script.attr
-lib/rpm/find-lang.sh
-lib/rpm/find-provides
-lib/rpm/find-requires
-lib/rpm/fontconfig.prov
-lib/rpm/libtooldeps.sh
-lib/rpm/macros
-lib/rpm/metainfo.prov
-lib/rpm/mkinstalldirs
-lib/rpm/ocaml-find-provides.sh
-lib/rpm/ocaml-find-requires.sh
-lib/rpm/perl.prov
-lib/rpm/perl.req
-lib/rpm/pkgconfigdeps.sh
-lib/rpm/platform/aarch64-%%OPSYS%%/macros
-lib/rpm/platform/alpha-%%OPSYS%%/macros
-lib/rpm/platform/alphaev5-%%OPSYS%%/macros
-lib/rpm/platform/alphaev56-%%OPSYS%%/macros
-lib/rpm/platform/alphaev6-%%OPSYS%%/macros
-lib/rpm/platform/alphaev67-%%OPSYS%%/macros
-lib/rpm/platform/alphapca56-%%OPSYS%%/macros
-lib/rpm/platform/amd64-%%OPSYS%%/macros
-lib/rpm/platform/armv3l-%%OPSYS%%/macros
-lib/rpm/platform/armv4b-%%OPSYS%%/macros
-lib/rpm/platform/armv4l-%%OPSYS%%/macros
-lib/rpm/platform/armv5tejl-%%OPSYS%%/macros
-lib/rpm/platform/armv5tel-%%OPSYS%%/macros
-lib/rpm/platform/armv5tl-%%OPSYS%%/macros
-lib/rpm/platform/armv6hl-%%OPSYS%%/macros
-lib/rpm/platform/armv6l-%%OPSYS%%/macros
-lib/rpm/platform/armv7hl-%%OPSYS%%/macros
-lib/rpm/platform/armv7hnl-%%OPSYS%%/macros
-lib/rpm/platform/armv7l-%%OPSYS%%/macros
-lib/rpm/platform/armv8hl-%%OPSYS%%/macros
-lib/rpm/platform/armv8l-%%OPSYS%%/macros
-lib/rpm/platform/athlon-%%OPSYS%%/macros
-lib/rpm/platform/geode-%%OPSYS%%/macros
-lib/rpm/platform/i386-%%OPSYS%%/macros
-lib/rpm/platform/i486-%%OPSYS%%/macros
-lib/rpm/platform/i586-%%OPSYS%%/macros
-lib/rpm/platform/i686-%%OPSYS%%/macros
-lib/rpm/platform/ia32e-%%OPSYS%%/macros
-lib/rpm/platform/ia64-%%OPSYS%%/macros
-lib/rpm/platform/m68k-%%OPSYS%%/macros
-lib/rpm/platform/mips-%%OPSYS%%/macros
-lib/rpm/platform/mips64-%%OPSYS%%/macros
-lib/rpm/platform/mips64el-%%OPSYS%%/macros
-lib/rpm/platform/mips64r6-%%OPSYS%%/macros
-lib/rpm/platform/mips64r6el-%%OPSYS%%/macros
-lib/rpm/platform/mipsel-%%OPSYS%%/macros
-lib/rpm/platform/mipsr6-%%OPSYS%%/macros
-lib/rpm/platform/mipsr6el-%%OPSYS%%/macros
-lib/rpm/platform/noarch-%%OPSYS%%/macros
-lib/rpm/platform/pentium3-%%OPSYS%%/macros
-lib/rpm/platform/pentium4-%%OPSYS%%/macros
-lib/rpm/platform/ppc-%%OPSYS%%/macros
-lib/rpm/platform/ppc32dy4-%%OPSYS%%/macros
-lib/rpm/platform/ppc64-%%OPSYS%%/macros
-lib/rpm/platform/ppc64iseries-%%OPSYS%%/macros
-lib/rpm/platform/ppc64le-%%OPSYS%%/macros
-lib/rpm/platform/ppc64p7-%%OPSYS%%/macros
-lib/rpm/platform/ppc64pseries-%%OPSYS%%/macros
-lib/rpm/platform/ppc8260-%%OPSYS%%/macros
-lib/rpm/platform/ppc8560-%%OPSYS%%/macros
-lib/rpm/platform/ppciseries-%%OPSYS%%/macros
-lib/rpm/platform/ppcpseries-%%OPSYS%%/macros
-lib/rpm/platform/riscv64-%%OPSYS%%/macros
-lib/rpm/platform/s390-%%OPSYS%%/macros
-lib/rpm/platform/s390x-%%OPSYS%%/macros
-lib/rpm/platform/sh-%%OPSYS%%/macros
-lib/rpm/platform/sh3-%%OPSYS%%/macros
-lib/rpm/platform/sh4-%%OPSYS%%/macros
-lib/rpm/platform/sh4a-%%OPSYS%%/macros
-lib/rpm/platform/sparc-%%OPSYS%%/macros
-lib/rpm/platform/sparc64-%%OPSYS%%/macros
-lib/rpm/platform/sparc64v-%%OPSYS%%/macros
-lib/rpm/platform/sparcv8-%%OPSYS%%/macros
-lib/rpm/platform/sparcv9-%%OPSYS%%/macros
-lib/rpm/platform/sparcv9v-%%OPSYS%%/macros
-lib/rpm/platform/x86_64-%%OPSYS%%/macros
-lib/rpm/pythondeps.sh
-%%PYTHON%%lib/rpm/pythondistdeps.py
-lib/rpm/rpm.daily
-lib/rpm/rpm.log
-lib/rpm/rpm.supp
-lib/rpm/rpm2cpio.sh
-lib/rpm/rpmdb_loadcvt
-lib/rpm/rpmdeps
-lib/rpm/rpmpopt-%%VERSION%%
-lib/rpm/rpmrc
-lib/rpm/script.req
-lib/rpm/tgpg
-%%PLUGINS%%lib/rpm-plugins/prioreset.so
-%%PLUGINS%%lib/rpm-plugins/syslog.so
-%%PLUGINS%%lib/rpm-plugins/systemd_inhibit.so
-libdata/pkgconfig/rpm.pc
+include/rpm/rpmver.h
+%%LUA_LIBDIR%%/%%LUA_LIBDIR%%rpm.so
+%%LUA_LIBDIR%%/%%LUA_LIBDIR%%rpm.so.9
+%%LUA_LIBDIR%%/%%LUA_LIBDIR%%rpm.so.9.1.0
+%%LUA_LIBDIR%%/%%LUA_LIBDIR%%rpmbuild.so
+%%LUA_LIBDIR%%/%%LUA_LIBDIR%%rpmbuild.so.9
+%%LUA_LIBDIR%%/%%LUA_LIBDIR%%rpmbuild.so.9.1.0
+%%LUA_LIBDIR%%/%%LUA_LIBDIR%%rpmio.so
+%%LUA_LIBDIR%%/%%LUA_LIBDIR%%rpmio.so.9
+%%LUA_LIBDIR%%/%%LUA_LIBDIR%%rpmio.so.9.1.0
+%%LUA_LIBDIR%%/%%LUA_LIBDIR%%rpmsign.so
+%%LUA_LIBDIR%%/%%LUA_LIBDIR%%rpmsign.so.9
+%%LUA_LIBDIR%%/%%LUA_LIBDIR%%rpmsign.so.9.1.0
+%%PYTHON_SITELIBDIR%%/rpm/__init__.py
+%%PYTHON_SITELIBDIR%%/rpm/_rpm.so
+%%PYTHON_SITELIBDIR%%/rpm/transaction.py
+%%LUA_LIBDIR%%/rpm/brp-compress
+%%LUA_LIBDIR%%/rpm/brp-java-gcjcompile
+%%LUA_LIBDIR%%/rpm/brp-python-bytecompile
+%%LUA_LIBDIR%%/rpm/brp-python-hardlink
+%%LUA_LIBDIR%%/rpm/brp-strip
+%%LUA_LIBDIR%%/rpm/brp-strip-comment-note
+%%LUA_LIBDIR%%/rpm/brp-strip-shared
+%%LUA_LIBDIR%%/rpm/brp-strip-static-archive
+%%LUA_LIBDIR%%/rpm/check-buildroot
+%%LUA_LIBDIR%%/rpm/check-files
+%%LUA_LIBDIR%%/rpm/check-prereqs
+%%LUA_LIBDIR%%/rpm/check-rpaths
+%%LUA_LIBDIR%%/rpm/check-rpaths-worker
+%%LUA_LIBDIR%%/rpm/fileattrs/debuginfo.attr
+%%LUA_LIBDIR%%/rpm/fileattrs/desktop.attr
+%%LUA_LIBDIR%%/rpm/fileattrs/elf.attr
+%%LUA_LIBDIR%%/rpm/fileattrs/font.attr
+%%LUA_LIBDIR%%/rpm/fileattrs/%%LUA_LIBDIR%%tool.attr
+%%LUA_LIBDIR%%/rpm/fileattrs/metainfo.attr
+%%LUA_LIBDIR%%/rpm/fileattrs/ocaml.attr
+%%LUA_LIBDIR%%/rpm/fileattrs/perl.attr
+%%LUA_LIBDIR%%/rpm/fileattrs/perl%%LUA_LIBDIR%%.attr
+%%LUA_LIBDIR%%/rpm/fileattrs/pkgconfig.attr
+%%LUA_LIBDIR%%/rpm/fileattrs/python.attr
+%%LUA_LIBDIR%%/rpm/fileattrs/pythondist.attr
+%%LUA_LIBDIR%%/rpm/fileattrs/script.attr
+%%LUA_LIBDIR%%/rpm/find-lang.sh
+%%LUA_LIBDIR%%/rpm/find-provides
+%%LUA_LIBDIR%%/rpm/find-requires
+%%LUA_LIBDIR%%/rpm/fontconfig.prov
+%%LUA_LIBDIR%%/rpm/%%LUA_LIBDIR%%tooldeps.sh
+%%LUA_LIBDIR%%/rpm/macros
+%%LUA_LIBDIR%%/rpm/mkinstalldirs
+%%LUA_LIBDIR%%/rpm/ocamldeps.sh
+%%LUA_LIBDIR%%/rpm/perl.prov
+%%LUA_LIBDIR%%/rpm/perl.req
+%%LUA_LIBDIR%%/rpm/pkgconfigdeps.sh
+%%LUA_LIBDIR%%/rpm/platform/aarch64-%%OPSYS%%/macros
+%%LUA_LIBDIR%%/rpm/platform/alpha-%%OPSYS%%/macros
+%%LUA_LIBDIR%%/rpm/platform/alphaev5-%%OPSYS%%/macros
+%%LUA_LIBDIR%%/rpm/platform/alphaev56-%%OPSYS%%/macros
+%%LUA_LIBDIR%%/rpm/platform/alphaev6-%%OPSYS%%/macros
+%%LUA_LIBDIR%%/rpm/platform/alphaev67-%%OPSYS%%/macros
+%%LUA_LIBDIR%%/rpm/platform/alphapca56-%%OPSYS%%/macros
+%%LUA_LIBDIR%%/rpm/platform/amd64-%%OPSYS%%/macros
+%%LUA_LIBDIR%%/rpm/platform/armv3l-%%OPSYS%%/macros
+%%LUA_LIBDIR%%/rpm/platform/armv4b-%%OPSYS%%/macros
+%%LUA_LIBDIR%%/rpm/platform/armv4l-%%OPSYS%%/macros
+%%LUA_LIBDIR%%/rpm/platform/armv5tejl-%%OPSYS%%/macros
+%%LUA_LIBDIR%%/rpm/platform/armv5tel-%%OPSYS%%/macros
+%%LUA_LIBDIR%%/rpm/platform/armv5tl-%%OPSYS%%/macros
+%%LUA_LIBDIR%%/rpm/platform/armv6hl-%%OPSYS%%/macros
+%%LUA_LIBDIR%%/rpm/platform/armv6l-%%OPSYS%%/macros
+%%LUA_LIBDIR%%/rpm/platform/armv7hl-%%OPSYS%%/macros
+%%LUA_LIBDIR%%/rpm/platform/armv7hnl-%%OPSYS%%/macros
+%%LUA_LIBDIR%%/rpm/platform/armv7l-%%OPSYS%%/macros
+%%LUA_LIBDIR%%/rpm/platform/armv8hl-%%OPSYS%%/macros
+%%LUA_LIBDIR%%/rpm/platform/armv8l-%%OPSYS%%/macros
+%%LUA_LIBDIR%%/rpm/platform/athlon-%%OPSYS%%/macros
+%%LUA_LIBDIR%%/rpm/platform/geode-%%OPSYS%%/macros
+%%LUA_LIBDIR%%/rpm/platform/i386-%%OPSYS%%/macros
+%%LUA_LIBDIR%%/rpm/platform/i486-%%OPSYS%%/macros
+%%LUA_LIBDIR%%/rpm/platform/i586-%%OPSYS%%/macros
+%%LUA_LIBDIR%%/rpm/platform/i686-%%OPSYS%%/macros
+%%LUA_LIBDIR%%/rpm/platform/ia32e-%%OPSYS%%/macros
+%%LUA_LIBDIR%%/rpm/platform/ia64-%%OPSYS%%/macros
+%%LUA_LIBDIR%%/rpm/platform/m68k-%%OPSYS%%/macros
+%%LUA_LIBDIR%%/rpm/platform/mips-%%OPSYS%%/macros
+%%LUA_LIBDIR%%/rpm/platform/mips64-%%OPSYS%%/macros
+%%LUA_LIBDIR%%/rpm/platform/mips64el-%%OPSYS%%/macros
+%%LUA_LIBDIR%%/rpm/platform/mips64r6-%%OPSYS%%/macros
+%%LUA_LIBDIR%%/rpm/platform/mips64r6el-%%OPSYS%%/macros
+%%LUA_LIBDIR%%/rpm/platform/mipsel-%%OPSYS%%/macros
+%%LUA_LIBDIR%%/rpm/platform/mipsr6-%%OPSYS%%/macros
+%%LUA_LIBDIR%%/rpm/platform/mipsr6el-%%OPSYS%%/macros
+%%LUA_LIBDIR%%/rpm/platform/noarch-%%OPSYS%%/macros
+%%LUA_LIBDIR%%/rpm/platform/pentium3-%%OPSYS%%/macros
+%%LUA_LIBDIR%%/rpm/platform/pentium4-%%OPSYS%%/macros
+%%LUA_LIBDIR%%/rpm/platform/ppc-%%OPSYS%%/macros
+%%LUA_LIBDIR%%/rpm/platform/ppc32dy4-%%OPSYS%%/macros
+%%LUA_LIBDIR%%/rpm/platform/ppc64-%%OPSYS%%/macros
+%%LUA_LIBDIR%%/rpm/platform/ppc64iseries-%%OPSYS%%/macros
+%%LUA_LIBDIR%%/rpm/platform/ppc64le-%%OPSYS%%/macros
+%%LUA_LIBDIR%%/rpm/platform/ppc64p7-%%OPSYS%%/macros
+%%LUA_LIBDIR%%/rpm/platform/ppc64pseries-%%OPSYS%%/macros
+%%LUA_LIBDIR%%/rpm/platform/ppc8260-%%OPSYS%%/macros
+%%LUA_LIBDIR%%/rpm/platform/ppc8560-%%OPSYS%%/macros
+%%LUA_LIBDIR%%/rpm/platform/ppciseries-%%OPSYS%%/macros
+%%LUA_LIBDIR%%/rpm/platform/ppcpseries-%%OPSYS%%/macros
+%%LUA_LIBDIR%%/rpm/platform/riscv64-%%OPSYS%%/macros
+%%LUA_LIBDIR%%/rpm/platform/s390-%%OPSYS%%/macros
+%%LUA_LIBDIR%%/rpm/platform/s390x-%%OPSYS%%/macros
+%%LUA_LIBDIR%%/rpm/platform/sh-%%OPSYS%%/macros
+%%LUA_LIBDIR%%/rpm/platform/sh3-%%OPSYS%%/macros
+%%LUA_LIBDIR%%/rpm/platform/sh4-%%OPSYS%%/macros
+%%LUA_LIBDIR%%/rpm/platform/sh4a-%%OPSYS%%/macros
+%%LUA_LIBDIR%%/rpm/platform/sparc-%%OPSYS%%/macros
+%%LUA_LIBDIR%%/rpm/platform/sparc64-%%OPSYS%%/macros
+%%LUA_LIBDIR%%/rpm/platform/sparc64v-%%OPSYS%%/macros
+%%LUA_LIBDIR%%/rpm/platform/sparcv8-%%OPSYS%%/macros
+%%LUA_LIBDIR%%/rpm/platform/sparcv9-%%OPSYS%%/macros
+%%LUA_LIBDIR%%/rpm/platform/sparcv9v-%%OPSYS%%/macros
+%%LUA_LIBDIR%%/rpm/platform/x86_64-%%OPSYS%%/macros
+%%LUA_LIBDIR%%/rpm/pythondistdeps.py
+%%LUA_LIBDIR%%/rpm/rpm.daily
+%%LUA_LIBDIR%%/rpm/rpm.log
+%%LUA_LIBDIR%%/rpm/rpm.supp
+%%LUA_LIBDIR%%/rpm/rpm2cpio.sh
+%%LUA_LIBDIR%%/rpm/rpmdb_dump
+%%LUA_LIBDIR%%/rpm/rpmdb_load
+%%LUA_LIBDIR%%/rpm/rpmdeps
+%%LUA_LIBDIR%%/rpm/rpmpopt-%%VERSION%%
+%%LUA_LIBDIR%%/rpm/rpmrc
+%%LUA_LIBDIR%%/rpm/script.req
+%%LUA_LIBDIR%%/rpm/tgpg
+%%LUA_LIBDIR%%data/pkgconfig/rpm.pc
 man/fr/man8/rpm.8.gz
 man/ja/man8/rpm.8.gz
 man/ja/man8/rpm2cpio.8.gz
@@ -194,8 +186,8 @@ man/ko/man8/rpm.8.gz
 man/ko/man8/rpm2cpio.8.gz
 man/man1/gendiff.1.gz
 man/man8/rpm-misc.8.gz
-man/man8/rpm-plugin-systemd-inhibit.8.gz
 man/man8/rpm.8.gz
+man/man8/rpm2archive.8.gz
 man/man8/rpm2cpio.8.gz
 man/man8/rpmbuild.8.gz
 man/man8/rpmdb.8.gz
@@ -248,5 +240,5 @@ man/sk/man8/rpm.8.gz
 %%NLS%%share/locale/vi/LC_MESSAGES/rpm.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/rpm.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/rpm.mo
-@dir lib/rpm/macros.d
 @dir %%LUA_LIBDIR%%/rpm/lua
+@dir %%LUA_LIBDIR%%/rpm/macros.d