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:   16-Jan-2008 02:37:03
  Branch: rpm-5_0                          Handle: 2008011601370201

  Modified files:           (Branch: rpm-5_0)
    rpm                     CHANGES configure.ac
    rpm/python              Makefile.am
    rpm/python/rpm          Makefile.am

  Log:
    fix auto detection of install location for python bindings

  Summary:
    Revision    Changes     Path
    1.2054.2.5  +1  -0      rpm/CHANGES
    2.269.2.3   +2  -2      rpm/configure.ac
    1.77.2.1    +1  -1      rpm/python/Makefile.am
    1.3.2.1     +1  -1      rpm/python/rpm/Makefile.am
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.2054.2.4 -r1.2054.2.5 CHANGES
  --- rpm/CHANGES	16 Jan 2008 01:33:29 -0000	1.2054.2.4
  +++ rpm/CHANGES	16 Jan 2008 01:37:02 -0000	1.2054.2.5
  @@ -1,4 +1,5 @@
   5.0.0 -> 5.0.1:
  +    - proyvind: fix install location of pkgconfig & python bindings (lib64 fix)
       - proyvind: fix install location of rpm.pc (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).
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/configure.ac
  ============================================================================
  $ cvs diff -u -r2.269.2.2 -r2.269.2.3 configure.ac
  --- rpm/configure.ac	15 Jan 2008 13:29:22 -0000	2.269.2.2
  +++ rpm/configure.ac	16 Jan 2008 01:37:02 -0000	2.269.2.3
  @@ -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)
   
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/python/Makefile.am
  ============================================================================
  $ cvs diff -u -r1.77 -r1.77.2.1 Makefile.am
  --- rpm/python/Makefile.am	3 Dec 2007 19:09:28 -0000	1.77
  +++ rpm/python/Makefile.am	16 Jan 2008 01:37:03 -0000	1.77.2.1
  @@ -41,7 +41,7 @@
   #LDADD =
   #LIBS =
   
  -rpmdir = $(pylibdir)/site-packages/rpm
  +rpmdir = $(pylibdir)/rpm
   rpm_LTLIBRARIES = _rpmmodule.la
   
   _rpmmodule_la_LDFLAGS = $(mylibs) -module -avoid-version
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/python/rpm/Makefile.am
  ============================================================================
  $ cvs diff -u -r1.3 -r1.3.2.1 Makefile.am
  --- rpm/python/rpm/Makefile.am	27 Sep 2007 08:09:48 -0000	1.3
  +++ rpm/python/rpm/Makefile.am	16 Jan 2008 01:37:03 -0000	1.3.2.1
  @@ -10,6 +10,6 @@
   EXTRA_DIST = \
   	__init__.py
   
  -rpmdir = $(pylibdir)/site-packages/rpm
  +rpmdir = $(pylibdir)/rpm
   rpm_SCRIPTS = \
   	__init__.py
  @@ .