RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Ralf S. Engelschall
  Root:   /v/rpm/cvs                       Email:  rse@rpm5.org
  Module: rpm                              Date:   29-Jan-2008 20:11:51
  Branch: HEAD                             Handle: 2008012919115001

  Modified files:
    rpm                     VENDOR
    rpm/lib                 poptALL.c
    rpm/rpmio               rpmlua.c

  Log:
    Still OpenPKG-specific until merged: support the regular CLI option
    --rpmlua to on-the-fly override hard-coded path of the Autoconf option
    --path-rpmlua. This CLI option compliments the --macros and --rpmpopt
    options.

  Summary:
    Revision    Changes     Path
    2.36        +9  -0      rpm/VENDOR
    2.78        +14 -0      rpm/lib/poptALL.c
    2.47        +9  -0      rpm/rpmio/rpmlua.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/VENDOR
  ============================================================================
  $ cvs diff -u -r2.35 -r2.36 VENDOR
  --- rpm/VENDOR	14 Jan 2008 19:10:21 -0000	2.35
  +++ rpm/VENDOR	29 Jan 2008 19:11:50 -0000	2.36
  @@ -421,6 +421,15 @@
                        from a temporary location (under $RPM_BUILD_ROOT).
        ________________________________________________________________________
   
  +     Change:         support-rpmlua-option
  +     Purpose:        Support the regular CLI option --rpmlua to
  +                     on-the-fly override hard-coded path of the Autoconf option
  +                     --path-rpmlua.
  +     Reason:         OpenPKG uses a rather complex --with-path-rpmlua option
  +                     during built-time and hence one also needs to be able
  +                     to override this on the command line.
  +     ________________________________________________________________________
  +
     o  Name:           RPM4DARWIN
        Vendor:         RPM for Darwin (Mac OS X) <http://rpm4darwin.sourceforge.net/>
        Representative: Anders F. Bjorklund <afb@users.sourceforge.net> <afb@rpm5.org>
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/poptALL.c
  ============================================================================
  $ cvs diff -u -r2.77 -r2.78 poptALL.c
  --- rpm/lib/poptALL.c	20 Jan 2008 10:13:00 -0000	2.77
  +++ rpm/lib/poptALL.c	29 Jan 2008 19:11:51 -0000	2.78
  @@ -169,6 +169,13 @@
   /*@unchecked@*/
   static int rpmcliInitialized = -1;
   
  +#if defined(RPM_VENDOR_OPENPKG) /* support-rpmlua-option */
  +#ifdef WITH_LUA
  +/*@unchecked@*/
  +extern const char *rpmluaFiles;
  +#endif
  +#endif
  +
   #if defined(RPM_VENDOR_OPENPKG) /* support-rpmpopt-option */
   /*@unchecked@*/
   static char *rpmpoptfiles = RPMPOPTFILES;
  @@ -442,6 +449,13 @@
    { "macros", '\0', POPT_ARG_STRING, &rpmMacrofiles, 0,
   	N_("read <FILE:...> instead of default file(s)"),
   	N_("<FILE:...>") },
  +#if defined(RPM_VENDOR_OPENPKG) /* support-rpmlua-option */
  +#ifdef WITH_LUA
  + { "rpmlua", '\0', POPT_ARG_STRING, &rpmluaFiles, 0,
  +	N_("read <FILE:...> instead of default RPM Lua file(s)"),
  +	N_("<FILE:...>") },
  +#endif
  +#endif
   #if defined(RPM_VENDOR_OPENPKG) /* support-rpmpopt-option */
    { "rpmpopt", '\0', POPT_ARG_STRING, NULL, 0,
   	N_("read <FILE:...> instead of default POPT file(s)"),
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/rpmlua.c
  ============================================================================
  $ cvs diff -u -r2.46 -r2.47 rpmlua.c
  --- rpm/rpmio/rpmlua.c	24 Jan 2008 20:44:57 -0000	2.46
  +++ rpm/rpmio/rpmlua.c	29 Jan 2008 19:11:51 -0000	2.47
  @@ -54,6 +54,11 @@
   	/*@globals fileSystem @*/
   	/*@modifies L, fileSystem @*/;
   
  +#if defined(RPM_VENDOR_OPENPKG) /* support-rpmlua-option */
  +/*@unchecked@*/
  +const char *rpmluaFiles = RPMLUAFILES;
  +#endif
  +
   rpmlua rpmluaGetGlobalState(void)
   {
   /*@-globstate@*/
  @@ -118,7 +123,11 @@
       rpmluaSetData(lua, "lua", lua);
   
       /* load all standard RPM Lua script files */
  +#if defined(RPM_VENDOR_OPENPKG) /* support-rpmlua-option */
  +    path_buf = xstrdup(rpmluaFiles);
  +#else
       path_buf = xstrdup(RPMLUAFILES);
  +#endif
       for (path = path_buf; path != NULL && *path != '\0'; path = path_next) {
           const char **av;
           struct stat st;
  @@ .