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

  Server: rpm5.org                         Name:   Jeff Johnson
  Root:   /v/rpm/cvs                       Email:  jbj@rpm5.org
  Module: rpm                              Date:   02-Sep-2008 00:33:22
  Branch: HEAD                             Handle: 2008090122332001

  Modified files:
    rpm                     CHANGES
    rpm/lib                 poptALL.c

  Log:
    - jbj: macosx: avoid multiple definitions of _program_name.

  Summary:
    Revision    Changes     Path
    1.2540      +1  -0      rpm/CHANGES
    2.99        +1  -1      rpm/lib/poptALL.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.2539 -r1.2540 CHANGES
  --- rpm/CHANGES	23 Aug 2008 07:38:11 -0000	1.2539
  +++ rpm/CHANGES	1 Sep 2008 22:33:20 -0000	1.2540
  @@ -1,5 +1,6 @@
   
   5.1.0 -> 5.2a0:
  +    - jbj: macosx: avoid multiple definitions of _program_name.
       - rse: upgrade embedded Lua from version 5.1.3 to 5.1.4
       - jbj: WR: remove --with-path-versioned in devtool targets.
       - jbj: WR: remove $(VERION) from macros paths in devtool targets.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/poptALL.c
  ============================================================================
  $ cvs diff -u -r2.98 -r2.99 poptALL.c
  --- rpm/lib/poptALL.c	22 Aug 2008 04:43:09 -0000	2.98
  +++ rpm/lib/poptALL.c	1 Sep 2008 22:33:21 -0000	2.99
  @@ -4,7 +4,7 @@
    */
   
   #include "system.h"
  -const char *__progname;
  +extern const char *__progname;
   
   #if defined(RPM_VENDOR_WINDRIVER)
   const char *__usrlibrpm = USRLIBRPM;
  @@ .