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 17:49:48
  Branch: HEAD                             Handle: 2007111116494800

  Modified files:
    rpm                     devtool.conf

  Log:
    remove temporary xar hacks for %macosx

  Summary:
    Revision    Changes     Path
    2.125       +5  -24     rpm/devtool.conf
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/devtool.conf
  ============================================================================
  $ cvs diff -u -r2.124 -r2.125 devtool.conf
  --- rpm/devtool.conf	11 Nov 2007 15:05:17 -0000	2.124
  +++ rpm/devtool.conf	11 Nov 2007 16:49:48 -0000	2.125
  @@ -1320,7 +1320,7 @@
       ##  This also requires --disable-dependency-tracking, since it doesn't
       ##  work with multiple -arch flags (see Apple's Technical Note TN2137)
       ##
  -    ##  These libraries are statically built internally: db, lua, zlib, file
  +    ##  These libraries are being built internally: db, lua, zlib, file, xar
       ##  These libraries are statically linked: neon, beecrypt, sqlite, popt
       ##  (building popt statically requires that the required popt.h header
       ##  is included within the rpm headers, so that it can be found later)
  @@ -1694,6 +1694,7 @@
               --with-lua=internal \
               --with-zlib=internal \
               --with-file=internal \
  +            --with-xar=internal \
               --with-neon="$basemac/bin/neon-${v_neon}" \
               --with-beecrypt="$basemac/bin/beecrypt-${v_beecrypt}" \
               --with-sqlite="$basemac/bin/sqlite-${v_sqlite}" \
  @@ -1705,37 +1706,17 @@
               --enable-shared \
               --disable-rpath \
               --disable-nls
  -
  -        #   XAR (uninstalled internal library)
  -        if [ -d "${DEVTOOL_SRCDIR}/xar" ]; then
  -            (   mkdir -p xar; cd xar
  -                (   echo "=== configuring in xar (`pwd`)"
  -                    CPP="$UNIVERSAL_CPP" \
  -                    CC="$UNIVERSAL_CC" \
  -                    CPPFLAGS="$UNIVERSAL_CPPFLAGS" \
  -                    CFLAGS="-O2 -g $UNIVERSAL_CFLAGS" \
  -                    LDFLAGS="$UNIVERSAL_LDFLAGS" \
  -                    ${DEVTOOL_SRCDIR}/xar/configure $UNIVERSAL_TARGET \
  -                        --prefix=/usr/local \
  -                        --disable-shared
  -                    make
  -                ) || exit $?
  -            ) || exit $?
  -        fi
       }
   
       #   do all at once
       prepare
  -    #%checkout
  -    %checkout xar
  +    %checkout
       %autogen
  -    ( cd ${DEVTOOL_SRCDIR}/xar && sh autogen.sh )
       configure
  -    perl -pe 's,-lxar,\$(top_builddir)/xar/lib/libxar.la,' -i rpmdb/Makefile
       gnumake
   
  -    perl -pe 's,-lxar,\$(top_builddir)/xar/lib/libxar.la,' -i tools/Makefile
  -    gnumake -C tools txar
  +    # build the internal txar tool, for testing purposes
  +    make -C tools txar || true
   
       # perl's MakeMaker ignores our -search_paths_first, and links with system libs :-(
       make -C perl LD="ld -search_paths_first" MACOSX_DEPLOYMENT_TARGET="10.3" clean all
  @@ .