RPM Community Forums

Mailing List Message of <rpm-cvs>

[CVS] RPM: rpm-4_5: rpm/ devtool.conf rpm/rpmdb/ Makefile.am

From: Jeff Johnson <jbj@rpm5.org>
Date: Thu 16 Aug 2007 - 15:20:54 CEST
Message-Id: <20070816132054.4B578348455@rpm5.org>
  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:   16-Aug-2007 15:20:54
  Branch: rpm-4_5                          Handle: 2007081614205301

  Modified files:           (Branch: rpm-4_5)
    rpm                     devtool.conf
    rpm/rpmdb               Makefile.am

  Log:
    use db-4.6.19 by default.

  Summary:
    Revision    Changes     Path
    2.7.2.4     +1  -1      rpm/devtool.conf
    1.53.2.4    +1  -1      rpm/rpmdb/Makefile.am
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/devtool.conf
  ============================================================================
  $ cvs diff -u -r2.7.2.3 -r2.7.2.4 devtool.conf
  --- rpm/devtool.conf	27 Jul 2007 15:21:03 -0000	2.7.2.3
  +++ rpm/devtool.conf	16 Aug 2007 13:20:53 -0000	2.7.2.4
  @@ -4,7 +4,7 @@
   
   %common
       MODULE_NAMES="db file lua zlib"
  -    MODULE_TAG_DB="rpm-4_5"
  +    MODULE_TAG_DB=""
       MODULE_TAG_FILE="rpm-4_5"
       MODULE_TAG_LUA="rpm-4_5"
       MODULE_TAG_ZLIB="rpm-4_5"
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmdb/Makefile.am
  ============================================================================
  $ cvs diff -u -r1.53.2.3 -r1.53.2.4 Makefile.am
  --- rpm/rpmdb/Makefile.am	17 Jun 2007 01:11:48 -0000	1.53.2.3
  +++ rpm/rpmdb/Makefile.am	16 Aug 2007 13:20:54 -0000	1.53.2.4
  @@ -97,7 +97,7 @@
   
   # XXX grrr, force noinst libdb.la for db3.
   $(libdb_la):
  -	sed -e"/^libdir=/s/^.*$$/libdir=''/" < $(top_builddir)/$(WITH_DB_SUBDIR)/libdb-4.5.la > $(libdb_la)
  +	sed -e"/^libdir=/s/^.*$$/libdir=''/" < $(top_builddir)/$(WITH_DB_SUBDIR)/libdb-4.6.la > $(libdb_la)
   
   db_archive_SOURCES =
   db_archive_LDADD = \
  @@ .
Received on Thu Aug 16 15:20:54 2007
Driven by Jeff Johnson and the RPM project team.
Hosted by OpenPKG and Ralf S. Engelschall.
Powered by FreeBSD and OpenPKG.