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:   01-Oct-2007 19:08:50
  Branch: HEAD                             Handle: 2007100118084900

  Modified files:
    rpm                     devtool.conf

  Log:
    allow any version of python for macosx, tested with /usr 2.3 and
    /usr/local 2.5

  Summary:
    Revision    Changes     Path
    2.102       +7  -9      rpm/devtool.conf
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/devtool.conf
  ============================================================================
  $ cvs diff -u -r2.101 -r2.102 devtool.conf
  --- rpm/devtool.conf	25 Sep 2007 20:19:18 -0000	2.101
  +++ rpm/devtool.conf	1 Oct 2007 17:08:49 -0000	2.102
  @@ -1663,9 +1663,7 @@
               --with-sqlite="$basemac/bin/sqlite-${v_sqlite}" \
               --with-popt="$basemac/bin/popt-${v_popt}" \
               --with-perl \
  -            --with-python=2.3 \
  -            --with-python-inc-dir=$UNIVERSAL_SDK/System/Library/Frameworks/Python.framework/Versions/2.3/include/python2.3 \
  -            --with-python-lib-dir=$UNIVERSAL_SDK/System/Library/Frameworks/Python.framework/Versions/2.3/lib/python2.3 \
  +            --with-python \
               --without-apidocs \
               --disable-static \
               --enable-shared \
  @@ -1729,14 +1727,14 @@
       rm /tmp/rpm-root/Library/Perl/5.8.?/darwin-thread-multi-2level/auto/RPM/.packlist
       
       # move perl/python modules to canonical /Library locations
  -    mkdir -p /tmp/rpm-root/Library/Python/2.3/site-packages/rpm
  -    mv /tmp/rpm-root/$UNIVERSAL_SDK/System/Library/Frameworks/Python.framework/Versions/2.3/lib/python2.3/site-packages/rpm/*.so \
  -       /tmp/rpm-root/Library/Python/2.3/site-packages/rpm
  +    mkdir -p /tmp/rpm-root/Library/Python/*/site-packages/rpm
  +    mv /tmp/rpm-root/$UNIVERSAL_SDK/System/Library/Frameworks/Python.framework/Versions/*/lib/python*/site-packages/rpm/*.so \
  +       /tmp/rpm-root/Library/Python/*/site-packages/rpm
       rm -r /tmp/rpm-root/System
       rm -r /tmp/rpm-root/Developer
  -    mv /tmp/rpm-root/usr/local/lib/python2.3/site-packages/rpm/*.py \
  -       /tmp/rpm-root/Library/Python/2.3/site-packages/rpm
  -    rm -r /tmp/rpm-root/usr/local/lib/python2.3
  +    mv /tmp/rpm-root/usr/local/lib/python*/site-packages/rpm/*.py \
  +       /tmp/rpm-root/Library/Python/*/site-packages/rpm
  +    rm -r /tmp/rpm-root/usr/local/lib/python*
       chmod 1775 /tmp/rpm-root/Library
       
       # setup default (undetected) configuration, for Mac OS X
  @@ .