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

  Server: rpm5.org                         Name:   Jeff Johnson
  Root:   /v/rpm/cvs                       Email:  jbj@rpm5.org
  Module: rpm                              Date:   29-Jul-2007 04:54:29
  Branch: HEAD                             Handle: 2007072903542801

  Modified files:
    rpm                     CHANGES configure.ac
    rpm/tools               Makefile.am

  Log:
    - upgrade to db-4.6.18.

  Summary:
    Revision    Changes     Path
    1.1526      +1  -0      rpm/CHANGES
    2.227       +1  -1      rpm/configure.ac
    2.95        +1  -1      rpm/tools/Makefile.am
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.1525 -r1.1526 CHANGES
  --- rpm/CHANGES	26 Jul 2007 08:10:30 -0000	1.1525
  +++ rpm/CHANGES	29 Jul 2007 02:54:28 -0000	1.1526
  @@ -1,4 +1,5 @@
   4.5 -> 5.0:
  +    - jbj: upgrade to db-4.6.18.
       - rse: drop MARK64 hack as it isn't RPM's business to decide for lib64 -- for this there is Autoconf option --libdir
       - rse: with --with-db-tools-integrated one can now build (and install) a db_tool which integrates all db_xxx BDB tools
       - jbj: add RPMTAG_DBINSTANCE header extension.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/configure.ac
  ============================================================================
  $ cvs diff -u -r2.226 -r2.227 configure.ac
  --- rpm/configure.ac	28 Jul 2007 07:00:03 -0000	2.226
  +++ rpm/configure.ac	29 Jul 2007 02:54:28 -0000	2.227
  @@ -852,7 +852,7 @@
   DBLIBSRCS=""
   RPM_CHECK_LIB(
       [Berkeley-DB], [db],
  -    [db-4.5 db-4.6 db], [db_create], [db.h],
  +    [db-4.6 db-4.5 db], [db_create], [db.h],
       [yes,internal:external], [db3],
       [ DBLIBSRCS="$DBLIBSRCS db3.c"
         AM_CONDITIONAL(WITH_DB, [ true ])
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/tools/Makefile.am
  ============================================================================
  $ cvs diff -u -r2.94 -r2.95 Makefile.am
  --- rpm/tools/Makefile.am	26 Jul 2007 07:39:26 -0000	2.94
  +++ rpm/tools/Makefile.am	29 Jul 2007 02:54:29 -0000	2.95
  @@ -73,7 +73,7 @@
   	$(top_builddir)/db3/gen_db_server.lo
   endif
   db_tool_LDADD += \
  -	$(top_builddir)/db3/libdb-4.5.la
  +	$(top_builddir)/db3/libdb-4.6.la
   endif
   endif
   
  @@ .