| 1 |
From d3edae7c4ecd3cef3e3ef9aa9a9e2eb6bf9f9e38 Mon Sep 17 00:00:00 2001 |
| 2 |
From: unknown author <cooker@mandrivalinux.org> |
| 3 |
Date: Mon, 5 Jan 2009 13:29:57 +0000 |
| 4 |
Subject: [PATCH 05/35] manbo rpmrc rpmpopt |
| 5 |
|
| 6 |
--- |
| 7 |
Makefile.am | 1 + |
| 8 |
lib/Makefile.am | 1 + |
| 9 |
lib/poptALL.c | 1 + |
| 10 |
lib/rpmrc.c | 2 +- |
| 11 |
rpmqv.c | 1 + |
| 12 |
5 files changed, 5 insertions(+), 1 deletions(-) |
| 13 |
|
| 14 |
diff --git a/Makefile.am b/Makefile.am |
| 15 |
index 74f1031..2e1e419 100644 |
| 16 |
--- a/Makefile.am |
| 17 |
+++ b/Makefile.am |
| 18 |
@@ -36,6 +36,7 @@ AM_CPPFLAGS += @WITH_LIBELF_INCLUDE@ |
| 19 |
AM_CPPFLAGS += -DLOCALEDIR="\"$(localedir)\"" |
| 20 |
AM_CPPFLAGS += -DRPMCONFIGDIR="\"@RPMCONFIGDIR@\"" |
| 21 |
AM_CPPFLAGS += -DLIBRPMALIAS_FILENAME="\"@RPMCONFIGDIR@/rpmpopt-${VERSION}\"" |
| 22 |
+AM_CPPFLAGS += -DLIBVENDORALIAS_FILENAME="\"@RPMCONFIGDIR@/manbo/rpmpopt\"" |
| 23 |
|
| 24 |
pkginclude_HEADERS = |
| 25 |
nodist_pkginclude_HEADERS = |
| 26 |
diff --git a/lib/Makefile.am b/lib/Makefile.am |
| 27 |
index cb4f376..70c20e7 100644 |
| 28 |
--- a/lib/Makefile.am |
| 29 |
+++ b/lib/Makefile.am |
| 30 |
@@ -12,6 +12,7 @@ AM_CPPFLAGS += -DSYSCONFDIR="\"$(sysconfdir)\"" |
| 31 |
AM_CPPFLAGS += -DLOCALSTATEDIR="\"$(localstatedir)\"" |
| 32 |
AM_CPPFLAGS += -DRPMCONFIGDIR="\"@RPMCONFIGDIR@\"" |
| 33 |
AM_CPPFLAGS += -DLIBRPMALIAS_FILENAME="\"@RPMCONFIGDIR@/rpmpopt-${VERSION}\"" |
| 34 |
+AM_CPPFLAGS += -DLIBVENDORALIAS_FILENAME="\"@RPMCONFIGDIR@/manbo/rpmpopt\"" |
| 35 |
|
| 36 |
check_PROGRAMS = |
| 37 |
CLEANFILES = |
| 38 |
diff --git a/lib/poptALL.c b/lib/poptALL.c |
| 39 |
index 520a3d3..600cd88 100644 |
| 40 |
--- a/lib/poptALL.c |
| 41 |
+++ b/lib/poptALL.c |
| 42 |
@@ -342,6 +342,7 @@ rpmcliInit(int argc, char *const argv[], struct poptOption * optionsTable) |
| 43 |
|
| 44 |
optCon = poptGetContext(__progname, argc, (const char **)argv, optionsTable, 0); |
| 45 |
(void) poptReadConfigFile(optCon, LIBRPMALIAS_FILENAME); |
| 46 |
+ (void) poptReadConfigFile(optCon, LIBVENDORALIAS_FILENAME); |
| 47 |
(void) poptReadDefaultConfig(optCon, 1); |
| 48 |
poptSetExecPath(optCon, RPMCONFIGDIR, 1); |
| 49 |
|
| 50 |
diff --git a/lib/rpmrc.c b/lib/rpmrc.c |
| 51 |
index eb430a4..bd5744b 100644 |
| 52 |
--- a/lib/rpmrc.c |
| 53 |
+++ b/lib/rpmrc.c |
| 54 |
@@ -26,7 +26,7 @@ |
| 55 |
|
| 56 |
static const char * const defrcfiles = |
| 57 |
RPMCONFIGDIR "/rpmrc" |
| 58 |
- ":" RPMCONFIGDIR "/" RPMCANONVENDOR "/rpmrc" |
| 59 |
+ ":" RPMCONFIGDIR "/" "manbo" "/rpmrc" |
| 60 |
":" SYSCONFDIR "/rpmrc" |
| 61 |
":~/.rpmrc"; |
| 62 |
|
| 63 |
diff --git a/rpmqv.c b/rpmqv.c |
| 64 |
index 3db1f9a..701cb3e 100644 |
| 65 |
--- a/rpmqv.c |
| 66 |
+++ b/rpmqv.c |
| 67 |
@@ -262,6 +262,7 @@ int main(int argc, char *argv[]) |
| 68 |
/* XXX popt argv definition should be fixed instead of casting... */ |
| 69 |
optCon = poptGetContext(poptCtx, argc, (const char **)argv, optionsTable, 0); |
| 70 |
(void) poptReadConfigFile(optCon, LIBRPMALIAS_FILENAME); |
| 71 |
+ (void) poptReadConfigFile(optCon, LIBVENDORALIAS_FILENAME); |
| 72 |
(void) poptReadDefaultConfig(optCon, 1); |
| 73 |
poptSetExecPath(optCon, RPMCONFIGDIR, 1); |
| 74 |
|
| 75 |
-- |
| 76 |
1.6.1.3 |
| 77 |
|
Parent Directory
| 
Revision Log