RPM Package Manager, CVS Repository
  /cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Jeff Johnson
  Root:   /v/rpm/cvs                       Email:  jbj@rpm5.org
  Module: rpm                              Date:   23-Sep-2010 21:50:23
  Branch: rpm-5_3                          Handle: 2010092319502200

  Modified files:           (Branch: rpm-5_3)
    rpm                     configure.ac
    rpm/macros              macros.in
    rpm/rpmio               .cvsignore

  Log:
    - macros: wire some additional executable paths into default macros.

  Summary:
    Revision    Changes     Path
    2.432.2.20  +4  -0      rpm/configure.ac
    1.28.2.3    +5  -1      rpm/macros/macros.in
    1.38.2.1    +1  -0      rpm/rpmio/.cvsignore
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/configure.ac
  ============================================================================
  $ cvs diff -u -r2.432.2.19 -r2.432.2.20 configure.ac
  --- rpm/configure.ac	22 Sep 2010 20:27:32 -0000	2.432.2.19
  +++ rpm/configure.ac	23 Sep 2010 19:50:22 -0000	2.432.2.20
  @@ -468,7 +468,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)
  @@ -480,6 +482,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)
  @@ -491,6 +494,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)
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/macros/macros.in
  ============================================================================
  $ cvs diff -u -r1.28.2.2 -r1.28.2.3 macros.in
  --- rpm/macros/macros.in	18 Sep 2010 18:25:06 -0000	1.28.2.2
  +++ rpm/macros/macros.in	23 Sep 2010 19:50:22 -0000	1.28.2.3
  @@ -1,7 +1,7 @@
   #/*! \page config_macros Default configuration: @USRLIBRPM@/macros
   # \verbatim
   #
  -# $Id: macros.in,v 1.28.2.2 2010/09/18 18:25:06 jbj Exp $
  +# $Id: macros.in,v 1.28.2.3 2010/09/23 19:50:22 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@
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/.cvsignore
  ============================================================================
  $ cvs diff -u -r1.38 -r1.38.2.1 .cvsignore
  --- rpm/rpmio/.cvsignore	1 Dec 2009 17:45:12 -0000	1.38
  +++ rpm/rpmio/.cvsignore	23 Sep 2010 19:50:22 -0000	1.38.2.1
  @@ -53,3 +53,4 @@
   truby
   tsw
   ttcl
  +xruby
  @@ .