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

  Server: rpm5.org                         Name:   Anders F. Björklund
  Root:   /v/rpm/cvs                       Email:  [EMAIL PROTECTED]
  Module: rpm                              Date:   07-Feb-2008 16:48:58
  Branch: HEAD                             Handle: 2008020715485800

  Modified files:
    rpm                     devtool.conf

  Log:
    make sure to canonicalize away from System as well as Local frameworks

  Summary:
    Revision    Changes     Path
    2.181       +2  -0      rpm/devtool.conf
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/devtool.conf
  ============================================================================
  $ cvs diff -u -r2.180 -r2.181 devtool.conf
  --- rpm/devtool.conf  5 Feb 2008 14:23:08 -0000       2.180
  +++ rpm/devtool.conf  7 Feb 2008 15:48:58 -0000       2.181
  @@ -1501,6 +1501,8 @@
       # move perl/python modules to canonical /Library locations
       python_version=`( grep -a ^WITH_PYTHON_VERSION config.log; echo 'echo 
$WITH_PYTHON_VERSION' ) | sh`
       mkdir -p /tmp/rpm-root/Library/Python/$python_version
  +    mv /tmp/rpm-root/System/Library/Frameworks/Python.framework/Versions/* \
  +       /tmp/rpm-root/Library/Python/ 2>/dev/null
       mv /tmp/rpm-root/Library/Frameworks/Python.framework/Versions/* \
          /tmp/rpm-root/Library/Python/ 2>/dev/null
       rm -r /tmp/rpm-root/Library/Frameworks 2>/dev/null
  @@ .
______________________________________________________________________
RPM Package Manager                                    http://rpm5.org
CVS Sources Repository                                rpm-cvs@rpm5.org

Reply via email to