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

  Server: rpm5.org                         Name:   Per Øyvind Karlsen
  Root:   /v/rpm/cvs                       Email:  pkarlsen@rpm5.org
  Module: rpm                              Date:   15-Jan-2008 19:37:07
  Branch: HEAD                             Handle: 2008011518370700

  Modified files:
    rpm                     CHANGES configure.ac

  Log:
    fix auto detection of install location for python bindings

  Summary:
    Revision    Changes     Path
    1.2070      +1  -1      rpm/CHANGES
    2.274       +2  -2      rpm/configure.ac
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.2069 -r1.2070 CHANGES
  --- rpm/CHANGES	15 Jan 2008 18:29:39 -0000	1.2069
  +++ rpm/CHANGES	15 Jan 2008 18:37:07 -0000	1.2070
  @@ -1,5 +1,5 @@
   5.0.0 -> 5.1a1:
  -    - proyvind: fix install location of rpm.pc (lib64 fix)
  +    - proyvind: fix install location of pkgconfig & python bindings (lib64 fix)
       - jbj: don't follow symlinks using chown/chgrp from --setugids pipe.
       - jbj: sync *.po with the translation project (sr@latin.po needs work).
       - rse: add a RPM Lua function rpm.sleep() as a trivial frontend to sleep(3)
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/configure.ac
  ============================================================================
  $ cvs diff -u -r2.273 -r2.274 configure.ac
  --- rpm/configure.ac	15 Jan 2008 13:27:29 -0000	2.273
  +++ rpm/configure.ac	15 Jan 2008 18:37:07 -0000	2.274
  @@ -886,9 +886,9 @@
   AC_SUBST(WITH_PYTHON_VERSION)
   
   AC_ARG_WITH(python-inc-dir, AS_HELP_STRING([--with-python-inc-dir=DIR], [directory with Python include files]),
  -	[WITH_PYTHON_INCDIR="$withval"], [WITH_PYTHON_INCDIR="${WITH_PYTHON_PREFIX}/include/python${WITH_PYTHON_VERSION}"])
  +	[WITH_PYTHON_INCDIR="$withval"], [WITH_PYTHON_INCDIR="`python -c 'from distutils.sysconfig import get_python_inc; print get_python_inc()'`"])
   AC_ARG_WITH(python-lib-dir, AS_HELP_STRING([--with-python-lib-dir=DIR], [directory with Python library]),
  -	[WITH_PYTHON_LIBDIR="$withval"], [WITH_PYTHON_LIBDIR="${WITH_PYTHON_PREFIX}/lib/python${WITH_PYTHON_VERSION}"])
  +	[WITH_PYTHON_LIBDIR="$withval"], [WITH_PYTHON_LIBDIR="`python -c 'from distutils.sysconfig import get_python_lib; print get_python_lib(1)'`"])
   AC_SUBST(WITH_PYTHON_INCDIR)
   AC_SUBST(WITH_PYTHON_LIBDIR)
   
  @@ .