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:   11-Oct-2007 09:59:41
  Branch: HEAD                             Handle: 2007101108594100

  Modified files:
    rpm                     devtool.conf

  Log:
    fix my Horrible Perl/Python Cleanup hack bugs

  Summary:
    Revision    Changes     Path
    2.104       +15 -7      rpm/devtool.conf
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/devtool.conf
  ============================================================================
  $ cvs diff -u -r2.103 -r2.104 devtool.conf
  --- rpm/devtool.conf	4 Oct 2007 06:38:41 -0000	2.103
  +++ rpm/devtool.conf	11 Oct 2007 07:59:41 -0000	2.104
  @@ -1723,18 +1723,26 @@
       mkdir -p /tmp/rpm-root/private/var/local/spool/repackage
   
       # remove generated/conflicting perl module files and lists
  -    rm /tmp/rpm-root/System/Library/Perl/5.8.?/darwin-thread-multi-2level/perllocal.pod
  -    rm /tmp/rpm-root/Library/Perl/5.8.?/darwin-thread-multi-2level/auto/RPM/.packlist
  +    rm /tmp/rpm-root/System/Library/Perl/*/darwin-thread-multi-2level/perllocal.pod
  +    rm /tmp/rpm-root/Library/Perl/*/darwin-thread-multi-2level/auto/RPM/.packlist
       
       # move perl/python modules to canonical /Library locations
  -    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
  +    python_version=`( grep ^WITH_PYTHON_VERSION config.log; echo 'echo $WITH_PYTHON_VERSION' ) | sh`
  +    mkdir -p /tmp/rpm-root/Library/Python/$python_version
  +    mv /tmp/rpm-root/Library/Frameworks/Python.framework/Versions/* \
  +       /tmp/rpm-root/Library/Python/
  +    rm -r /tmp/rpm-root/Library/Frameworks
  +    mv /tmp/rpm-root/Library/Python/*/lib/python*/site-packages \
  +       /tmp/rpm-root/Library/Python/*/
  +    rm -r /tmp/rpm-root/Library/Python/*/lib
       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*
  +    mv /tmp/rpm-root/usr/lib/python*/site-packages/rpm/*.py \
  +       /tmp/rpm-root/Library/Python/*/site-packages/rpm
  +    rm -r /tmp/rpm-root/usr/lib
  +    rm -r /tmp/rpm-root/System
  +    rm -r /tmp/rpm-root/Developer
       chmod 1775 /tmp/rpm-root/Library
       
       # setup default (undetected) configuration, for Mac OS X
  @@ .