RPM Package Manager, CVS Repository
  /cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Jeff Johnson
  Root:   /v/rpm/cvs                       Email:  jbj@rpm5.org
  Module: rpm                              Date:   23-Aug-2010 15:27:53
  Branch: HEAD                             Handle: 2010082313275201

  Modified files:
    rpm                     CHANGES
    rpm/tools               Makefile.am

  Log:
    - jbj: grep: leave rpmgrep internal, autopoint gets heartburn

  Summary:
    Revision    Changes     Path
    1.3421      +1  -0      rpm/CHANGES
    2.165       +2  -2      rpm/tools/Makefile.am
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.3420 -r1.3421 CHANGES
  --- rpm/CHANGES	23 Aug 2010 13:24:13 -0000	1.3420
  +++ rpm/CHANGES	23 Aug 2010 13:27:52 -0000	1.3421
  @@ -1,4 +1,5 @@
   5.3.2 -> 5.4a1:
  +    - jbj: grep: leave rpmgrep internal, autopoint gets heartburn.
       - jbj: pcre: upgrade to pcre-8.10.
       - jbj: db: upgrade to db-5.0.26.
       - jbj: solve: commit to a test framework based on EDOS and Poky.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/tools/Makefile.am
  ============================================================================
  $ cvs diff -u -r2.164 -r2.165 Makefile.am
  --- rpm/tools/Makefile.am	29 Apr 2010 23:35:18 -0000	2.164
  +++ rpm/tools/Makefile.am	23 Aug 2010 13:27:53 -0000	2.165
  @@ -23,7 +23,7 @@
   
   EXTRA_DIST =	hashtab.h bsdiff.1 bspatch.1 dotgraph.hh
   
  -EXTRA_PROGRAMS = augtool cudftool debugedit \
  +EXTRA_PROGRAMS = augtool cudftool debugedit grep \
   	nix-build nix-channel nix-collect-garbage nix-copy-closure \
   	nix-env nix-hash nix-install-package nix-instantiate \
   	nix-log2xml nix-prefetch-url nix-pull nix-push nix-store nix-worker \
  @@ -54,7 +54,7 @@
   
   pkgbindir =		@USRLIBRPM@/bin
   pkgbin_PROGRAMS =	\
  -	@WITH_AUGEAS_AUGTOOL@ chroot cp @WITH_CUDF_CUDFTOOL@ find grep mtree \
  +	@WITH_AUGEAS_AUGTOOL@ chroot cp @WITH_CUDF_CUDFTOOL@ find mtree \
   	@WITH_SEMANAGE_SEMODULE@ wget \
   	rpmcache rpmdigest rpmrepo rpmspecdump \
   	rpmcmp rpmdeps sqlite3 @WITH_KEYUTILS_RPMKEY@ @WITH_LIBELF_DEBUGEDIT@
  @@ .