diff options
| author |   Tony Vroon <chainsaw@gentoo.org> | 2020-10-01 12:15:19 +0100 |
|---|---|---|
| committer | Tony Vroon <chainsaw@gentoo.org> | 2020-10-01 12:17:52 +0100 |
| commit | 3bfda681c33a63ebe64a04f5ef0084c3d07990aa (patch) | |
| tree | 781fd060c428b5dcf650de00b5d167f53d085ce2 /app-arch/rpm/files | |
| parent | dev-python/ipython: Stabilize 7.18.1 ALLARCHES, #745534 (diff) | |
| download | gentoo-3bfda681c33a63ebe64a04f5ef0084c3d07990aa.tar.gz gentoo-3bfda681c33a63ebe64a04f5ef0084c3d07990aa.tar.bz2 gentoo-3bfda681c33a63ebe64a04f5ef0084c3d07990aa.zip | |
app-arch/rpm: Version bump to 4.16.0
This has USE="zstd" defaulted to on to ensure Fedora 31 packages are
recognised without issue.
Closes: https://bugs.gentoo.org/520312
Closes: https://bugs.gentoo.org/730354
Closes: https://bugs.gentoo.org/740078
Signed-Off-By: Tony Vroon <chainsaw@gentoo.org>
Diffstat (limited to 'app-arch/rpm/files')
| -rw-r--r-- | app-arch/rpm/files/rpm-4.16.0-autotools.patch | 13 | ||||
| -rw-r--r-- | app-arch/rpm/files/rpm-4.16.0-libdir.patch | 34 |
2 files changed, 47 insertions, 0 deletions
diff --git a/app-arch/rpm/files/rpm-4.16.0-autotools.patch b/app-arch/rpm/files/rpm-4.16.0-autotools.patch new file mode 100644 index 000000000000..9b1f71ad86e5 --- /dev/null +++ b/app-arch/rpm/files/rpm-4.16.0-autotools.patch @@ -0,0 +1,13 @@ +diff -uNr rpm-4.16.0.ORIG/configure.ac rpm-4.16.0/configure.ac +--- rpm-4.16.0.ORIG/configure.ac 2020-10-01 11:02:21.605485875 +0100 ++++ rpm-4.16.0/configure.ac 2020-10-01 11:05:34.077157904 +0100 +@@ -552,9 +552,6 @@ + + AM_CONDITIONAL([BDB], [test "x$have_bdb" != "xno"]) + AM_CONDITIONAL([WITH_INTERNAL_DB],[test "x$have_bdb" = "xinternal"]) +-if test "x$have_bdb" = "xinternal"; then +- AC_CONFIG_SUBDIRS(db3) +-fi + + + #================= diff --git a/app-arch/rpm/files/rpm-4.16.0-libdir.patch b/app-arch/rpm/files/rpm-4.16.0-libdir.patch new file mode 100644 index 000000000000..c9f5f297233b --- /dev/null +++ b/app-arch/rpm/files/rpm-4.16.0-libdir.patch @@ -0,0 +1,34 @@ +diff -uNr rpm-4.16.0.ORIG/configure.ac rpm-4.16.0/configure.ac +--- rpm-4.16.0.ORIG/configure.ac 2020-10-01 11:08:43.780842602 +0100 ++++ rpm-4.16.0/configure.ac 2020-10-01 11:09:03.533705353 +0100 +@@ -935,13 +935,7 @@ + AC_DEFINE_UNQUOTED([RUNDIR],["${RUNDIR}"],[run-time variable directory]) + AC_SUBST(RUNDIR) + +-if test X"$prefix" = XNONE ; then +- usrprefix="$ac_default_prefix" +-else +- usrprefix=$prefix +-fi +- +-RPMCONFIGDIR="`echo ${usrprefix}/lib/rpm`" ++RPMCONFIGDIR="`echo ${libexecdir}/rpm/`" + AC_SUBST(RPMCONFIGDIR) + + AC_SUBST(OBJDUMP) +diff -uNr rpm-4.16.0.ORIG/rpm.am rpm-4.16.0/rpm.am +--- rpm-4.16.0.ORIG/rpm.am 2020-10-01 11:08:43.743842859 +0100 ++++ rpm-4.16.0/rpm.am 2020-10-01 11:09:03.533705353 +0100 +@@ -1,10 +1,8 @@ + # Internal binaries +-## HACK: It probably should be $(libexecdir)/rpm or $(libdir)/rpm +-rpmlibexecdir = $(prefix)/lib/rpm ++rpmlibexecdir = $(pkglibexecdir) + + # Host independent config files +-## HACK: it probably should be $(datadir)/rpm +-rpmconfigdir = $(prefix)/lib/rpm ++rpmconfigdir = $(pkglibexecdir) + + # Libtool version (current-revision-age) for all our libraries + rpm_version_info = 10:0:1 |