diff options
Diffstat (limited to 'app-arch/rpm/files')
-rw-r--r-- | app-arch/rpm/files/rpm-4.11.0-autotools.patch | 14 | ||||
-rw-r--r-- | app-arch/rpm/files/rpm-4.8.1-db-path.patch | 26 | ||||
-rw-r--r-- | app-arch/rpm/files/rpm-4.9.1.2-libdir.patch | 31 |
3 files changed, 71 insertions, 0 deletions
diff --git a/app-arch/rpm/files/rpm-4.11.0-autotools.patch b/app-arch/rpm/files/rpm-4.11.0-autotools.patch new file mode 100644 index 000000000000..2a2dcb129de3 --- /dev/null +++ b/app-arch/rpm/files/rpm-4.11.0-autotools.patch @@ -0,0 +1,14 @@ +diff -urN rpm-4.11.0.1.old/configure.ac rpm-4.11.0.1/configure.ac +--- rpm-4.11.0.1.old/configure.ac 2013-03-26 18:38:35.137667450 +0100 ++++ rpm-4.11.0.1/configure.ac 2013-03-26 18:44:08.632673258 +0100 +@@ -824,10 +810,6 @@ + + AC_SUBST(OBJDUMP) + +-if test "$with_external_db" = no; then +- AC_CONFIG_SUBDIRS(db3) +-fi +- + AM_CONDITIONAL([WITH_INTERNAL_DB],[test "$with_external_db" = no]) + AM_CONDITIONAL([DOXYGEN],[test "$DOXYGEN" != no]) + AM_CONDITIONAL([HACKINGDOCS],[test "$with_hackingdocs" = yes]) diff --git a/app-arch/rpm/files/rpm-4.8.1-db-path.patch b/app-arch/rpm/files/rpm-4.8.1-db-path.patch new file mode 100644 index 000000000000..634dd2373ab8 --- /dev/null +++ b/app-arch/rpm/files/rpm-4.8.1-db-path.patch @@ -0,0 +1,26 @@ +diff --git a/Makefile.am b/Makefile.am +index 587cfa7..498abfb 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -177,7 +177,7 @@ EXTRA_DIST += rpmpopt.in + + usrsrcdir = $(prefix)/src + +-rpmvardir = $(localstatedir)/lib/rpm ++rpmvardir = $(localstatedir)/rpm + rpmvar_DATA = + + install-exec-hook: +diff --git a/macros.in b/macros.in +index ae46fcb..213b53c 100644 +--- a/macros.in ++++ b/macros.in +@@ -155,7 +155,7 @@ + %_bzip2bin %{__bzip2} + + # The location of the rpm database file(s). +-%_dbpath %{_var}/lib/rpm ++%_dbpath %{_var}/rpm + + # The location of the rpm database file(s) after "rpm --rebuilddb". + %_dbpath_rebuild %{_dbpath} diff --git a/app-arch/rpm/files/rpm-4.9.1.2-libdir.patch b/app-arch/rpm/files/rpm-4.9.1.2-libdir.patch new file mode 100644 index 000000000000..221926494411 --- /dev/null +++ b/app-arch/rpm/files/rpm-4.9.1.2-libdir.patch @@ -0,0 +1,31 @@ +diff -urN rpm-4.9.1.2.old/configure.ac rpm-4.9.1.2/configure.ac +--- rpm-4.9.1.2.old/configure.ac 2012-04-19 12:18:27.584725220 +0200 ++++ rpm-4.9.1.2/configure.ac 2012-04-19 12:34:50.302722933 +0200 +@@ -846,13 +846,7 @@ + AC_SUBST(RPMCANONGNU) + AC_DEFINE_UNQUOTED([RPMCANONVENDOR],["${RPMCANONVENDOR}"],[canonical vendor]) + +-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 -urN rpm-4.9.1.2.old/rpm.am rpm-4.9.1.2/rpm.am +--- rpm-4.9.1.2.old/rpm.am 2012-04-19 12:18:27.584725220 +0200 ++++ rpm-4.9.1.2/rpm.am 2012-04-19 12:24:49.035724332 +0200 +@@ -1,7 +1,5 @@ + # 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) |