[prev in list] [next in list] [prev in thread] [next in thread] 

List:       rpm-cvs
Subject:    [CVS] RPM: rpm-4_5: rpm/ CHANGES rpm/tools/ Makefile.am rpmrepo.c
From:       "Robert Scheck" <robert () rpm5 ! org>
Date:       2008-06-21 19:45:20
Message-ID: 20080621194520.2FBAC34848A () rpm5 ! org
[Download RAW message or body]

  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Robert Scheck
  Root:   /v/rpm/cvs                       Email:  robert@rpm5.org
  Module: rpm                              Date:   21-Jun-2008 21:45:20
  Branch: rpm-4_5                          Handle: 2008062119451900

  Modified files:           (Branch: rpm-4_5)
    rpm                     CHANGES
    rpm/tools               Makefile.am rpmrepo.c

  Log:
    - robert: rpmrepo: enable/disable sqlite dependent on rest of rpm

  Summary:
    Revision    Changes     Path
    1.1360.2.111+1  -0      rpm/CHANGES
    2.85.2.7    +1  -1      rpm/tools/Makefile.am
    1.1.2.9     +4  -1      rpm/tools/rpmrepo.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.1360.2.110 -r1.1360.2.111 CHANGES
  --- rpm/CHANGES	18 Jun 2008 19:46:38 -0000	1.1360.2.110
  +++ rpm/CHANGES	21 Jun 2008 19:45:19 -0000	1.1360.2.111
  @@ -1,4 +1,5 @@
   4.4.9 -> 4.5:
  +	- robert: rpmrepo: enable/disable sqlite dependent on rest of rpm
   	- jbj: fix: allocate Icon: buffer after iconsize is initialized.
   	- jbj: fix: skip %exclude/%ghost files to get more accurate RPMTAG_SIZE.
   	- jbj: fix: RPMTAG_SIZE is incorrect with %exclude and %ghost directives
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/tools/Makefile.am
  ============================================================================
  $ cvs diff -u -r2.85.2.6 -r2.85.2.7 Makefile.am
  --- rpm/tools/Makefile.am	12 Jun 2008 20:35:41 -0000	2.85.2.6
  +++ rpm/tools/Makefile.am	21 Jun 2008 19:45:19 -0000	2.85.2.7
  @@ -38,6 +38,6 @@
   rpmmtree_SOURCES =	rpmmtree.c
   
   rpmrepo_SOURCES =	rpmrepo.c
  -rpmrepo_LDADD =		$(LDADD) -lsqlite3
  +rpmrepo_LDADD =		$(LDADD) @WITH_SQLITE3_LIB@
   
   $(PROGRAMS): $(LDADD)
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/tools/rpmrepo.c
  ============================================================================
  $ cvs diff -u -r1.1.2.8 -r1.1.2.9 rpmrepo.c
  --- rpm/tools/rpmrepo.c	3 Jun 2008 20:38:13 -0000	1.1.2.8
  +++ rpm/tools/rpmrepo.c	21 Jun 2008 19:45:19 -0000	1.1.2.9
  @@ -16,10 +16,13 @@
   #define	rpmioAllPoptTable	rpmcliAllPoptTable
   
   #define	tagClean(_p)
  -#define	WITH_SQLITE
   
   #include "system.h"
   
  +#ifdef HAVE_SQLITE3_H
  +#define	WITH_SQLITE
  +#endif
  +
   #if defined(WITH_SQLITE)
   #include <sqlite3.h>
   #ifdef	__LCLINT__
  @@ .
______________________________________________________________________
RPM Package Manager                                    http://rpm5.org
CVS Sources Repository                                rpm-cvs@rpm5.org
[prev in list] [next in list] [prev in thread] [next in thread]