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

  Server: rpm5.org                         Name:   Anders F. Björklund
  Root:   /v/rpm/cvs                       Email:  afb@rpm5.org
  Module: rpm                              Date:   21-Dec-2007 18:13:08
  Branch: HEAD                             Handle: 2007122117130800

  Modified files:
    rpm                     CHANGES macros.in

  Log:
    fix python default locations on Mac OS X, install left to do

  Summary:
    Revision    Changes     Path
    1.2005      +1  -0      rpm/CHANGES
    1.217       +3  -3      rpm/macros.in
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.2004 -r1.2005 CHANGES
  --- rpm/CHANGES	21 Dec 2007 14:42:20 -0000	1.2004
  +++ rpm/CHANGES	21 Dec 2007 17:13:08 -0000	1.2005
  @@ -1,4 +1,5 @@
   5.0b2 -> 5.0b3:
  +    - afb: make sure to dereference symlinks for the python library paths.
       - jbj: fix: permit -bt on specfiles w/o %track, remove an assertion.
       - rse: fix paths to stringbuf.[ch]
       - pixel: fix http://qa.mandriva.com/show_bug.cgi?id=27417.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/macros.in
  ============================================================================
  $ cvs diff -u -r1.216 -r1.217 macros.in
  --- rpm/macros.in	19 Dec 2007 19:38:35 -0000	1.216
  +++ rpm/macros.in	21 Dec 2007 17:13:08 -0000	1.217
  @@ -1,7 +1,7 @@
   #/*! \page config_macros Default configuration: @USRLIBRPM@/macros
   # \verbatim
   #
  -# $Id: macros.in,v 1.216 2007/12/19 19:38:35 jbj Exp $
  +# $Id: macros.in,v 1.217 2007/12/21 17:13:08 afb Exp $
   #
   # This is a global RPM configuration file. All changes made here will
   # be lost when the rpm package is upgraded. Any per-system configuration
  @@ -1489,8 +1489,8 @@
   
   # Useful macros for building *.rpm python packages (for python > 1.6).
   #
  -%python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")
  -%python_sitelib	%(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
  +%python_sitearch %(%{__python} -c "import os; from distutils.sysconfig import get_python_lib; lib=get_python_lib(1); print os.path.islink(lib) and os.path.abspath(os.path.join(os.path.dirname(lib),os.readlink(lib))) or lib")
  +%python_sitelib	%(%{__python} -c "import os; from distutils.sysconfig import get_python_lib; lib=get_python_lib(); print os.path.islink(lib) and os.path.abspath(os.path.join(os.path.dirname(lib),os.readlink(lib))) or lib")
   %python_version	%(%{__python} -c "import sys; print(sys.version[0:3])")
   
   %py_compile(O)  \
  @@ .