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:   03-Nov-2007 12:53:03
  Branch: HEAD                             Handle: 2007110311530300

  Modified files:
    rpm                     devtool.conf

  Log:
    don't leak UNIVERSAL_CPP to the rpm macros

  Summary:
    Revision    Changes     Path
    2.116       +1  -0      rpm/devtool.conf
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/devtool.conf
  ============================================================================
  $ cvs diff -u -r2.115 -r2.116 devtool.conf
  --- rpm/devtool.conf	3 Nov 2007 11:29:14 -0000	2.115
  +++ rpm/devtool.conf	3 Nov 2007 11:53:03 -0000	2.116
  @@ -1771,6 +1771,7 @@
       chmod 1775 /tmp/rpm-root/Library
       
       # setup default (undetected) configuration, for Mac OS X
  +    sed -i -e "s,${UNIVERSAL_CPP},gcc -E," /tmp/rpm-root/usr/local/lib/rpm/macros
       sed -i -e "s,${UNIVERSAL_CC},gcc," /tmp/rpm-root/usr/local/lib/rpm/macros
       sed -i -e 's,-gnu$,%{nil},' /tmp/rpm-root/usr/local/lib/rpm/macros
       sed -i -e 's,libtoolize$,glibtoolize,' /tmp/rpm-root/usr/local/lib/rpm/macros
  @@ .