RPM Community Forums

Mailing List Message of <rpm-cvs>

[CVS] RPM: rpm/ configure.ac rpm/macros/ macros.in

From: Jeff Johnson <jbj@rpm5.org>
Date: Mon 27 Sep 2010 - 23:27:35 CEST
Message-Id: <20100927212735.1A7B9DCC5B@rpm5.org>
  RPM Package Manager, CVS Repository
  /cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Jeff Johnson
  Root:   /v/rpm/cvs                       Email:  jbj@rpm5.org
  Module: rpm                              Date:   27-Sep-2010 23:27:35
  Branch: HEAD                             Handle: 2010092721273400

  Modified files:
    rpm                     configure.ac
    rpm/macros              macros.in

  Log:
    - find paths to sqlite3/git/gsr/mongo.

  Summary:
    Revision    Changes     Path
    2.453       +6  -0      rpm/configure.ac
    1.31        +5  -1      rpm/macros/macros.in
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/configure.ac
  ============================================================================
  $ cvs diff -u -r2.452 -r2.453 configure.ac
  --- rpm/configure.ac	18 Sep 2010 14:11:55 -0000	2.452
  +++ rpm/configure.ac	27 Sep 2010 21:27:34 -0000	2.453
  @@ -469,7 +469,9 @@
   AC_PATH_PROG(__DIFF, diff, /bin/diff, $MYPATH)
   AC_PATH_PROG(__DITTO, ditto, %{_bindir}/ditto, $MYPATH)
   AC_PATH_PROG(__FILE, file, %{_bindir}/file, $MYPATH)
  +AC_PATH_PROG(__GIT, git, %{_bindir}/git, $MYPATH)
   AC_PATH_PROG(__GPG, gpg, %{_bindir}/gpg, $MYPATH)
  +AC_PATH_PROG(__GSR, gsr, %{_bindir}/gsr, $MYPATH)
   AC_PATH_PROG(__GZIP, gzip, /bin/gzip, $MYPATH)
   AC_PATH_PROG(__HG, hg, %{_bindir}/hg, $MYPATH)
   AC_PATH_PROG(__ID, id, /usr/bin/id, $MYPATH)
  @@ -481,6 +483,7 @@
   AC_PATH_PROG(__LZOP, lzop, %{_bindir}/lzop, $MYPATH)
   AC_PATH_PROG(__MAKE, make, %{_bindir}/make, $MYPATH)
   AC_PATH_PROG(__MKDIR, mkdir, /bin/mkdir, $MYPATH)
  +AC_PATH_PROG(__MONGO, mongo, %{_bindir}/mongo, $MYPATH)
   AC_PATH_PROG(__MV, mv, /bin/mv, $MYPATH)
   AC_PATH_PROG(__PATCH, patch, %{_bindir}/patch, $MYPATH)
   AC_PATH_PROG(__PAX, pax, %{_bindir}/pax, $MYPATH)
  @@ -492,6 +495,7 @@
   AC_PATH_PROG(__RSH, rsh, %{_bindir}/rsh, $MYPATH)
   AC_PATH_PROG(__SED, sed, /bin/sed, $MYPATH)
   AC_PATH_PROG(__SH, sh, /bin/sh, $MYPATH)
  +AC_PATH_PROG(__SQLITE3, sqlite3, %{_bindir}/sqlite3, $MYPATH)
   AC_PATH_PROG(__SSH, ssh, %{_bindir}/ssh, $MYPATH)
   AC_PATH_PROG(__SVN, svn, %{_bindir}/svn, $MYPATH)
   AC_PATH_PROG(__TAR, tar, /bin/tar, $MYPATH)
  @@ -1400,6 +1404,8 @@
       [])
   
   dnl # Sqlite 3.6.23.1 internal from db-5.0.x
  +dnl XXX hot-wire db3/sql (in cvs, but removed by make distclean)
  +mkdir -p db3/sql
   RPM_CHECK_LIB(
       [Berkeley DB SQL], [dbsql],
       [db_sql-5.0 db_sql], [sqlite3_open], [],
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/macros/macros.in
  ============================================================================
  $ cvs diff -u -r1.30 -r1.31 macros.in
  --- rpm/macros/macros.in	10 Aug 2010 10:46:39 -0000	1.30
  +++ rpm/macros/macros.in	27 Sep 2010 21:27:34 -0000	1.31
  @@ -1,7 +1,7 @@
   #/*! \page config_macros Default configuration: @USRLIBRPM@/macros
   # \verbatim
   #
  -# $Id: macros.in,v 1.30 2010/08/10 10:46:39 devzero2000 Exp $
  +# $Id: macros.in,v 1.31 2010/09/27 21:27:34 jbj Exp $
   #
   # This is a global RPM configuration file. All changes made here will
   # be lost when the rpm package is upgraded. Any per-system configuration
  @@ -70,7 +70,9 @@
   %__diff			@__DIFF@
   %__ditto		@__DITTO@
   %__file			@__FILE@
  +%__git			@__GIT@
   %__gpg			@__GPG@
  +%__gsr			@__GSR@
   %__gzip			@__GZIP@
   %__hg			@__HG@
   %__id			@__ID@
  @@ -85,6 +87,7 @@
   %make			%{__make}
   %__mkdir		@__MKDIR@
   %__mkdir_p		@__MKDIR_P@
  +%__mongo		@__MONGO@
   %__mv			@__MV@
   %__patch		@__PATCH@
   %__pax			@__PAX@
  @@ -93,6 +96,7 @@
   %__rsh			@__RSH@
   %__sed			@__SED@
   %__sh			@__SH@
  +%__sqlite3		@__SQLITE3@
   %__ssh			@__SSH@
   %__svn			@__SVN@
   %__tar			@__TAR@
  @@ .
Received on Mon Sep 27 23:27:35 2010
Driven by Jeff Johnson and the RPM project team.
Hosted by OpenPKG and Ralf S. Engelschall.
Powered by FreeBSD and OpenPKG.