diff options
Diffstat (limited to 'app-arch/rpm/files')
| -rw-r--r-- | app-arch/rpm/files/rpm-4.8.0-autotools.patch | 48 | ||||
| -rw-r--r-- | app-arch/rpm/files/rpm-4.8.0-db-path.patch | 26 |
2 files changed, 74 insertions, 0 deletions
diff --git a/app-arch/rpm/files/rpm-4.8.0-autotools.patch b/app-arch/rpm/files/rpm-4.8.0-autotools.patch new file mode 100644 index 000000000000..d4016be824ab --- /dev/null +++ b/app-arch/rpm/files/rpm-4.8.0-autotools.patch @@ -0,0 +1,48 @@ +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/configure.ac b/configure.ac +index 8c2ef50..1ec8978 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -305,14 +305,9 @@ AM_CONDITIONAL(LIBDWARF,[test "$WITH_LIBDWARF" = yes]) + # which we use too and hopefully is slightly more unique to NSS. + WITH_NSS_INCLUDE= + WITH_NSS_LIB= +-AC_CHECK_HEADERS([nspr.h nss.h sechash.h], [], [ +- AC_MSG_ERROR([missing required NSPR / NSS header]) +-]) +-AC_CHECK_LIB(nss3, NSS_NoDB_Init, [ +- WITH_NSS_LIB=-lnss3 +-], [ +- AC_MSG_ERROR([missing required NSS library 'nss3']) +-]) ++PKG_CHECK_MODULES(NSS, [ nss >= 3.0.0 ]) ++WITH_NSS_INCLUDE=$NSS_CFLAGS ++WITH_NSS_LIB=$NSS_LIBS + AC_SUBST(WITH_NSS_INCLUDE) + AC_SUBST(WITH_NSS_LIB) + +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.8.0-db-path.patch b/app-arch/rpm/files/rpm-4.8.0-db-path.patch new file mode 100644 index 000000000000..634dd2373ab8 --- /dev/null +++ b/app-arch/rpm/files/rpm-4.8.0-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} |