RPM Package Manager, CVS Repository
  /cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Jeff Johnson
  Root:   /v/rpm/cvs                       Email:  jbj@rpm5.org
  Module: rpm                              Date:   27-Aug-2010 14:51:23
  Branch: HEAD                             Handle: 2010082712512201

  Modified files:
    rpm                     CHANGES
    rpm/rpmio               rpmsql.c
    rpm/tools               dbsql.c sqlite3.c

  Log:
    - permit building --without-sqlite again.

  Summary:
    Revision    Changes     Path
    1.3425      +4  -1      rpm/CHANGES
    2.57        +14 -4      rpm/rpmio/rpmsql.c
    2.14        +2  -0      rpm/tools/dbsql.c
    2.3         +2  -0      rpm/tools/sqlite3.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.3424 -r1.3425 CHANGES
  --- rpm/CHANGES	23 Aug 2010 19:44:16 -0000	1.3424
  +++ rpm/CHANGES	27 Aug 2010 12:51:22 -0000	1.3425
  @@ -1,4 +1,7 @@
  -5.3.2 -> 5.4a1:
  +5.3.3 -> 5.4a1:
  +    - jbj: permit building --without-sqlite again.
  +
  +5.3.2 -> 5.3.3:
       - jbj: beecrypt: finish up --with-beecrypt=internal wiring into -lrpmmisc.
       - jbj: neon: finish up --with-neon=internal wiring into -lrpmmisc.
       - jbj: misc: add ne_* symbols to loader map for --with-neon=internal.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/rpmsql.c
  ============================================================================
  $ cvs diff -u -r2.56 -r2.57 rpmsql.c
  --- rpm/rpmio/rpmsql.c	23 Jun 2010 16:14:53 -0000	2.56
  +++ rpm/rpmio/rpmsql.c	27 Aug 2010 12:51:22 -0000	2.57
  @@ -4,10 +4,6 @@
   
   #define	_RPMIOB_INTERNAL	/* rpmiobSlurp */
   #include "rpmio_internal.h"	/* XXX fdGetFILE */
  -#define	_RPMSQL_INTERNAL
  -#define	_RPMVT_INTERNAL
  -#define	_RPMVC_INTERNAL
  -#include <rpmsql.h>
   #include <rpmmacro.h>
   #include <rpmdir.h>
   #include <rpmurl.h>
  @@ -21,6 +17,11 @@
   #include <sqlite3.h>
   #endif	/* WITH_SQLITE */
   
  +#define	_RPMSQL_INTERNAL
  +#define	_RPMVT_INTERNAL
  +#define	_RPMVC_INTERNAL
  +#include <rpmsql.h>
  +
   #ifdef	NOTYET		/* XXX FIXME */
   #include <editline/readline.h>
   #elif defined(HAVE_READLINE) && HAVE_READLINE==1
  @@ -134,6 +135,9 @@
   }
   
   /*==============================================================*/
  +
  +#if defined(WITH_SQLITE)
  +
   typedef struct key_s {
       const char * k;
       uint32_t v;
  @@ -564,6 +568,7 @@
   VTDBG(vt, (stderr, "<-- %s(%p,%s) rc %d\n", __FUNCTION__, vt, zNew, rc));
       return rc;
   }
  +#endif /* defined(WITH_SQLITE) */
   
   /*==============================================================*/
   
  @@ -619,6 +624,10 @@
       return vc;
   }
   
  +/*==============================================================*/
  +
  +#if defined(WITH_SQLITE)
  +
   int rpmvcOpen(rpmvt vt, rpmvc * vcp)
   {
       rpmvc vc = rpmvcNew(vt, vt->ac);
  @@ -796,6 +805,7 @@
   VCDBG(vc, (stderr, "<-- %s(%p,%p) rc %d rowid 0x%llx\n", __FUNCTION__, vc, pRowid, rc, (unsigned long long)(pRowid ? *pRowid : 0xf00)));
       return rc;
   }
  +#endif /* defined(WITH_SQLITE) */
   
   /*==============================================================*/
   
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/tools/dbsql.c
  ============================================================================
  $ cvs diff -u -r2.13 -r2.14 dbsql.c
  --- rpm/tools/dbsql.c	11 Apr 2010 13:24:06 -0000	2.13
  +++ rpm/tools/dbsql.c	27 Aug 2010 12:51:23 -0000	2.14
  @@ -42,10 +42,12 @@
   {
       NotUsed = NotUsed;
       _rpmsqlSeenInterrupt = 1;
  +#if defined(WITH_SQLITE)
       if (_rpmsqlI && _rpmsqlI->I) {
   	sqlite3 * db = (sqlite3 *) _rpmsqlI->I;
   	sqlite3_interrupt(db);
       }
  +#endif
   }
   #endif
   
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/tools/sqlite3.c
  ============================================================================
  $ cvs diff -u -r2.2 -r2.3 sqlite3.c
  --- rpm/tools/sqlite3.c	11 Apr 2010 13:24:06 -0000	2.2
  +++ rpm/tools/sqlite3.c	27 Aug 2010 12:51:23 -0000	2.3
  @@ -42,10 +42,12 @@
   {
       NotUsed = NotUsed;
       _rpmsqlSeenInterrupt = 1;
  +#if defined(WITH_SQLITE)
       if (_rpmsqlI && _rpmsqlI->I) {
   	sqlite3 * db = (sqlite3 *) _rpmsqlI->I;
   	sqlite3_interrupt(db);
       }
  +#endif
   }
   #endif
   
  @@ .