Sophie

Sophie

distrib > Mandriva > 2008.0 > x86_64 > by-pkgid > a35732d620cfac4812adc8d6b2992f07 > files > 7

rpm-4.4.8-22.1mdv2008.0.src.rpm

Index: configure.ac
===================================================================
--- configure.ac
+++ configure.ac	2007-02-27 18:32:48.936174000 +0100
@@ -1493,6 +1493,12 @@
 AC_DEFINE_UNQUOTED(LIBRPMALIAS_FILENAME, "$LIBRPMALIAS_FILENAME",
 	[Full path to rpmpopt configuration file (usually /usr/lib/rpm/rpmpopt)])
 AC_SUBST(LIBRPMALIAS_FILENAME)
+
+LIBVENDORALIAS_FILENAME="${USRLIBRPM}/${RPMCANONVENDOR}/rpmpopt"
+AC_DEFINE_UNQUOTED(LIBVENDORALIAS_FILENAME, "$LIBVENDORALIAS_FILENAME",
+    [Full path to vendor rpmpopt configuration file (usually /usr/lib/rpm/vendor/rpmpopt)])
+AC_SUBST(LIBVENDORALIAS_FILENAME)
+
 FINDREQUIRES="${USRLIBRPM}/find-requires"
 AC_DEFINE_UNQUOTED(FINDREQUIRES, "$FINDREQUIRES",
 	[Full path to find-requires script (usually /usr/lib/rpm/find-requires)])
Index: lib/poptALL.c
===================================================================
--- lib/poptALL.c
+++ lib/poptALL.c	2007-02-27 18:38:22.754435574 +0100
@@ -544,6 +544,7 @@
     optCon = poptGetContext(__progname, argc, (const char **)argv, optionsTable, 0);
 /*@=nullpass =temptrans@*/
     (void) poptReadConfigFile(optCon, LIBRPMALIAS_FILENAME);
+    (void) poptReadConfigFile(optCon, LIBVENDORALIAS_FILENAME);
     (void) poptReadDefaultConfig(optCon, 1);
     poptSetExecPath(optCon, USRLIBRPM, 1);