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:35:11
  Branch: rpm-5_1                          Handle: 2008090122351001

  Modified files:           (Branch: rpm-5_1)
    rpm                     CHANGES
    rpm/lib                 poptALL.c

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

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

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.2288.2.103 -r1.2288.2.104 CHANGES
  --- rpm/CHANGES	29 Aug 2008 06:56:35 -0000	1.2288.2.103
  +++ rpm/CHANGES	1 Sep 2008 22:35:10 -0000	1.2288.2.104
  @@ -1,4 +1,5 @@
   5.1.4 -> 5.1.5:
  +    - jbj: macosx: avoid multiple definitions of _program_name.
       - jbj: merge po files.
       - jbj: don't expand removed python/rpm/Makefile.in.
       - rse: upgrade embedded Lua from version 5.1.3 to 5.1.4
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/poptALL.c
  ============================================================================
  $ cvs diff -u -r2.90.2.2 -r2.90.2.3 poptALL.c
  --- rpm/lib/poptALL.c	22 Aug 2008 04:46:47 -0000	2.90.2.2
  +++ rpm/lib/poptALL.c	1 Sep 2008 22:35:11 -0000	2.90.2.3
  @@ -4,7 +4,7 @@
    */
   
   #include "system.h"
  -const char *__progname;
  +extern const char *__progname;
   
   #if defined(RPM_VENDOR_WINDRIVER)
   const char *__usrlibrpm = USRLIBRPM;
  @@ .