| 1 |
sochotnicky 10/05/05 20:54:04 |
| 2 |
|
| 3 |
Added: rpm-4.8.0-autotools.patch rpm-4.8.0-db-path.patch |
| 4 |
Log: |
| 5 |
Adding app-arch/rpm-4.8.0 (~x86, ~amd64) |
| 6 |
(Portage version: 2.1.8.3/cvs/Linux i686) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 app-arch/rpm/files/rpm-4.8.0-autotools.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-arch/rpm/files/rpm-4.8.0-autotools.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-arch/rpm/files/rpm-4.8.0-autotools.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: rpm-4.8.0-autotools.patch |
| 15 |
=================================================================== |
| 16 |
diff --git a/Makefile.am b/Makefile.am |
| 17 |
index 587cfa7..498abfb 100644 |
| 18 |
--- a/Makefile.am |
| 19 |
+++ b/Makefile.am |
| 20 |
@@ -177,7 +177,7 @@ EXTRA_DIST += rpmpopt.in |
| 21 |
|
| 22 |
usrsrcdir = $(prefix)/src |
| 23 |
|
| 24 |
-rpmvardir = $(localstatedir)/lib/rpm |
| 25 |
+rpmvardir = $(localstatedir)/rpm |
| 26 |
rpmvar_DATA = |
| 27 |
|
| 28 |
install-exec-hook: |
| 29 |
diff --git a/configure.ac b/configure.ac |
| 30 |
index 8c2ef50..1ec8978 100644 |
| 31 |
--- a/configure.ac |
| 32 |
+++ b/configure.ac |
| 33 |
@@ -305,14 +305,9 @@ AM_CONDITIONAL(LIBDWARF,[test "$WITH_LIBDWARF" = yes]) |
| 34 |
# which we use too and hopefully is slightly more unique to NSS. |
| 35 |
WITH_NSS_INCLUDE= |
| 36 |
WITH_NSS_LIB= |
| 37 |
-AC_CHECK_HEADERS([nspr.h nss.h sechash.h], [], [ |
| 38 |
- AC_MSG_ERROR([missing required NSPR / NSS header]) |
| 39 |
-]) |
| 40 |
-AC_CHECK_LIB(nss3, NSS_NoDB_Init, [ |
| 41 |
- WITH_NSS_LIB=-lnss3 |
| 42 |
-], [ |
| 43 |
- AC_MSG_ERROR([missing required NSS library 'nss3']) |
| 44 |
-]) |
| 45 |
+PKG_CHECK_MODULES(NSS, [ nss >= 3.0.0 ]) |
| 46 |
+WITH_NSS_INCLUDE=$NSS_CFLAGS |
| 47 |
+WITH_NSS_LIB=$NSS_LIBS |
| 48 |
AC_SUBST(WITH_NSS_INCLUDE) |
| 49 |
AC_SUBST(WITH_NSS_LIB) |
| 50 |
|
| 51 |
diff --git a/macros.in b/macros.in |
| 52 |
index ae46fcb..213b53c 100644 |
| 53 |
--- a/macros.in |
| 54 |
+++ b/macros.in |
| 55 |
@@ -155,7 +155,7 @@ |
| 56 |
%_bzip2bin %{__bzip2} |
| 57 |
|
| 58 |
# The location of the rpm database file(s). |
| 59 |
-%_dbpath %{_var}/lib/rpm |
| 60 |
+%_dbpath %{_var}/rpm |
| 61 |
|
| 62 |
# The location of the rpm database file(s) after "rpm --rebuilddb". |
| 63 |
%_dbpath_rebuild %{_dbpath} |
| 64 |
|
| 65 |
|
| 66 |
|
| 67 |
1.1 app-arch/rpm/files/rpm-4.8.0-db-path.patch |
| 68 |
|
| 69 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-arch/rpm/files/rpm-4.8.0-db-path.patch?rev=1.1&view=markup |
| 70 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-arch/rpm/files/rpm-4.8.0-db-path.patch?rev=1.1&content-type=text/plain |
| 71 |
|
| 72 |
Index: rpm-4.8.0-db-path.patch |
| 73 |
=================================================================== |
| 74 |
diff --git a/Makefile.am b/Makefile.am |
| 75 |
index 587cfa7..498abfb 100644 |
| 76 |
--- a/Makefile.am |
| 77 |
+++ b/Makefile.am |
| 78 |
@@ -177,7 +177,7 @@ EXTRA_DIST += rpmpopt.in |
| 79 |
|
| 80 |
usrsrcdir = $(prefix)/src |
| 81 |
|
| 82 |
-rpmvardir = $(localstatedir)/lib/rpm |
| 83 |
+rpmvardir = $(localstatedir)/rpm |
| 84 |
rpmvar_DATA = |
| 85 |
|
| 86 |
install-exec-hook: |
| 87 |
diff --git a/macros.in b/macros.in |
| 88 |
index ae46fcb..213b53c 100644 |
| 89 |
--- a/macros.in |
| 90 |
+++ b/macros.in |
| 91 |
@@ -155,7 +155,7 @@ |
| 92 |
%_bzip2bin %{__bzip2} |
| 93 |
|
| 94 |
# The location of the rpm database file(s). |
| 95 |
-%_dbpath %{_var}/lib/rpm |
| 96 |
+%_dbpath %{_var}/rpm |
| 97 |
|
| 98 |
# The location of the rpm database file(s) after "rpm --rebuilddb". |
| 99 |
%_dbpath_rebuild %{_dbpath} |
Archives