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:   09-Dec-2007 13:06:42
  Branch: HEAD                             Handle: 2007120912064200

  Modified files:
    rpm                     TODO devtool.conf

  Log:
    make sure libxar is static, remove xar/libxar %macosx binaries

  Summary:
    Revision    Changes     Path
    1.60        +0  -1      rpm/TODO
    2.143       +26 -0      rpm/devtool.conf
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/TODO
  ============================================================================
  $ cvs diff -u -r1.59 -r1.60 TODO
  --- rpm/TODO	8 Dec 2007 19:47:12 -0000	1.59
  +++ rpm/TODO	9 Dec 2007 12:06:42 -0000	1.60
  @@ -49,7 +49,6 @@
     *CANDO* items.
   
     o to be resolved before RPM 5.0b1:
  -    - afb: remove xar and libxar from default install with internal xar (use through rpm and librpm*)
       - jbj: HEAD segfaults under "devtool standalone"'s test-drive as it
              builds RPM with prefix="/tmp/rpm" (see line 309 in
              devtool.conf). When one uses a longer prefix, e.g.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/devtool.conf
  ============================================================================
  $ cvs diff -u -r2.142 -r2.143 devtool.conf
  --- rpm/devtool.conf	6 Dec 2007 14:55:22 -0000	2.142
  +++ rpm/devtool.conf	9 Dec 2007 12:06:42 -0000	2.143
  @@ -1775,6 +1775,22 @@
               --enable-shared \
               --disable-rpath \
               --disable-nls
  +
  +# make sure that xar is statically linked, like db/lua/zlib/file are
  +        cd xar
  +        ${DEVTOOL_SRCDIR}/xar/configure $UNIVERSAL_TARGET -v \
  +            --prefix=/usr/local \
  +            --sysconfdir=/private/etc \
  +            --localstatedir=/private/var/local \
  +            --mandir=/usr/local/share/man \
  +            --infodir=/usr/local/share/info \
  +            --disable-dependency-tracking \
  +            --program-prefix="" \
  +            --enable-static \
  +            --disable-shared \
  +            --disable-rpath \
  +            --disable-nls
  +        cd ..
       }
   
       #   do all at once
  @@ -1853,6 +1869,16 @@
       cp -p tools/.libs/txar /tmp/rpm-root/usr/local/lib/rpm
       strip -S /tmp/rpm-root/usr/local/lib/rpm/txar
   
  +    # remove xar binaries
  +    rm -f /tmp/rpm-root/usr/local/bin/xar
  +    rm -f /tmp/rpm-root/usr/local/share/man/man1/xar.1
  +    rm -f /tmp/rpm-root/usr/local/include/xar/xar.h
  +    rmdir /tmp/rpm-root/usr/local/include/xar
  +    rm -f /tmp/rpm-root/usr/local/lib/libxar.1.dylib
  +    rm -f /tmp/rpm-root/usr/local/lib/libxar.dylib
  +    rm -f /tmp/rpm-root/usr/local/lib/libxar.a
  +    rm -f /tmp/rpm-root/usr/local/lib/libxar.la
  +
       # strip debugging symbols, and remove libtool files (.la)
       strip -S /tmp/rpm-root/usr/local/bin/rpm
       strip -S /tmp/rpm-root/usr/local/bin/rpmbuild
  @@ .