RPM Community Forums

Mailing List Message of <rpm-cvs>

[CVS] RPM: rpm/ devtool.conf

From: Anders F. Björklund <afb@rpm5.org>
Date: Sat 20 Oct 2007 - 23:33:49 CEST
Message-Id: <20071020213349.8D33C34845A@rpm5.org>
  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:   20-Oct-2007 23:33:49
  Branch: HEAD                             Handle: 2007102022334900

  Modified files:
    rpm                     devtool.conf

  Log:
    fix %macosx packaging when using /usr/bin/python

  Summary:
    Revision    Changes     Path
    2.108       +2  -1      rpm/devtool.conf
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/devtool.conf
  ============================================================================
  $ cvs diff -u -r2.107 -r2.108 devtool.conf
  --- rpm/devtool.conf	12 Oct 2007 14:01:38 -0000	2.107
  +++ rpm/devtool.conf	20 Oct 2007 21:33:49 -0000	2.108
  @@ -1736,10 +1736,11 @@
       mv /tmp/rpm-root/Library/Python/*/lib/python*/site-packages \
          /tmp/rpm-root/Library/Python/*/
       rm -r /tmp/rpm-root/Library/Python/*/lib
  +    mkdir -p /tmp/rpm-root/Library/Python/$python_version/site-packages/rpm
       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 \
  +    mv /tmp/rpm-root/usr/lib/python*/site-packages/rpm/* \
          /tmp/rpm-root/Library/Python/*/site-packages/rpm
       rm -r /tmp/rpm-root/usr/lib
       rm -r /tmp/rpm-root/System
  @@ .
Received on Sat Oct 20 23:33:49 2007
Driven by Jeff Johnson and the RPM project team.
Hosted by OpenPKG and Ralf S. Engelschall.
Powered by FreeBSD and OpenPKG.