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-Nov-2007 15:38:21
  Branch: HEAD                             Handle: 2007111114382100

  Modified files:
    rpm                     devtool.conf

  Log:
    rpmdb now requires xar, so build it earlier (and avoid temporary
    destroot)

  Summary:
    Revision    Changes     Path
    2.123       +3  -5      rpm/devtool.conf
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/devtool.conf
  ============================================================================
  $ cvs diff -u -r2.122 -r2.123 devtool.conf
  --- rpm/devtool.conf	10 Nov 2007 15:02:23 -0000	2.122
  +++ rpm/devtool.conf	11 Nov 2007 14:38:21 -0000	2.123
  @@ -1670,8 +1670,6 @@
           CFLAGS="-O2 -g $UNIVERSAL_CFLAGS"
           LDFLAGS="$UNIVERSAL_LDFLAGS -Wl,-search_paths_first" # static
           LIBS="$LIBS -lssl -lcrypto" # shameless workaround for Neon
  -        CPPFLAGS="$CPPFLAGS -I/tmp/xar-root/usr/local/include"
  -        LDFLAGS="$LDFLAGS -L/tmp/xar-root/usr/local/lib"
           export CPP
           export CC
           export CPPFLAGS
  @@ -1719,6 +1717,7 @@
                       ${DEVTOOL_SRCDIR}/xar/configure $UNIVERSAL_TARGET \
                           --prefix=/usr/local \
                           --disable-shared
  +                    make
                   ) || exit $?
               ) || exit $?
           fi
  @@ -1731,11 +1730,10 @@
       %autogen
       ( cd ${DEVTOOL_SRCDIR}/xar && sh autogen.sh )
       configure
  +    perl -pe 's,-lxar,\$(top_builddir)/xar/lib/libxar.la,' -i rpmdb/Makefile
       gnumake
   
  -    # build xar into a temporary destroot, then build txar
  -    gnumake -C xar all install DESTDIR=/tmp/xar-root
  -    perl -pe 's,-lxar,/tmp/xar-root/usr/local/lib/libxar.la,' -i tools/Makefile
  +    perl -pe 's,-lxar,\$(top_builddir)/xar/lib/libxar.la,' -i tools/Makefile
       gnumake -C tools txar
   
       # perl's MakeMaker ignores our -search_paths_first, and links with system libs :-(
  @@ .