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:   23-Nov-2007 00:05:37
  Branch: HEAD                             Handle: 2007112223053600

  Modified files:
    rpm/rpmio               rpmxar.c rpmxar.h

  Log:
    make rpmxar compile (no-op) without xar.h

  Summary:
    Revision    Changes     Path
    2.4         +2  -0      rpm/rpmio/rpmxar.c
    2.4         +2  -0      rpm/rpmio/rpmxar.h
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/rpmio/rpmxar.c
  ============================================================================
  $ cvs diff -u -r2.3 -r2.4 rpmxar.c
  --- rpm/rpmio/rpmxar.c	22 Nov 2007 17:55:29 -0000	2.3
  +++ rpm/rpmio/rpmxar.c	22 Nov 2007 23:05:36 -0000	2.4
  @@ -1,5 +1,7 @@
   #include "system.h"
  +#ifdef HAVE_XAR_H
   #include "xar.h"
  +#endif
   
   #define	_RPMXAR_INTERNAL
   #include <rpmio_internal.h>
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/rpmxar.h
  ============================================================================
  $ cvs diff -u -r2.3 -r2.4 rpmxar.h
  --- rpm/rpmio/rpmxar.h	22 Nov 2007 17:55:29 -0000	2.3
  +++ rpm/rpmio/rpmxar.h	22 Nov 2007 23:05:36 -0000	2.4
  @@ -8,9 +8,11 @@
   
   #ifdef	_RPMXAR_INTERNAL
   struct rpmxar_s {
  +#ifdef HAVE_XAR_H
       xar_t x;
       xar_file_t f;
       xar_iter_t i;
  +#endif
   /*@null@*/
       const char * member;	/*!< Current archive member. */
       char * b;			/*!< Data buffer. */
  @@ .