RPM Package Manager, CVS Repository
  /cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Jeff Johnson
  Root:   /v/rpm/cvs                       Email:  jbj@rpm5.org
  Module: rpm pcre                         Date:   23-Aug-2010 15:54:43
  Branch: rpm-5_3                          Handle: 2010082313544201

  Modified files:           (Branch: rpm-5_3)
    pcre                    .cvsignore Makefile.am
    rpm                     CHANGES devtool.conf
    rpm/tools               Makefile.am

  Log:
    - grep: leave rpmgrep internal, autopoint gets heartburn.
    - pcre: upgrade to pcre-8.10.

  Summary:
    Revision    Changes     Path
    1.5.2.1     +1  -0      pcre/.cvsignore
    1.3.2.2     +1  -1      pcre/Makefile.am
    1.3296.2.63 +2  -0      rpm/CHANGES
    2.333.2.15  +1  -1      rpm/devtool.conf
    2.157.2.4   +2  -2      rpm/tools/Makefile.am
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: pcre/.cvsignore
  ============================================================================
  $ cvs diff -u -r1.5 -r1.5.2.1 .cvsignore
  --- pcre/.cvsignore	6 Dec 2009 17:13:30 -0000	1.5
  +++ pcre/.cvsignore	23 Aug 2010 13:54:42 -0000	1.5.2.1
  @@ -16,6 +16,7 @@
   libpcreposix.pc
   libtool
   ltmain.sh
  +m4
   pcre-config
   pcre.h
   pcre_stringpiece.h
  @@ .
  patch -p0 <<'@@ .'
  Index: pcre/Makefile.am
  ============================================================================
  $ cvs diff -u -r1.3.2.1 -r1.3.2.2 Makefile.am
  --- pcre/Makefile.am	23 Aug 2010 13:08:52 -0000	1.3.2.1
  +++ pcre/Makefile.am	23 Aug 2010 13:54:42 -0000	1.3.2.2
  @@ -338,7 +338,7 @@
   
   # We have .pc files for pkg-config users.
   pkgconfigdir = $(libdir)/pkgconfig
  -noinst_DATA = libpcre.pc libpcreposix.pc
  +noinst_DATA += libpcre.pc libpcreposix.pc
   if WITH_PCRE_CPP
   noinst_DATA += libpcrecpp.pc
   endif
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.3296.2.62 -r1.3296.2.63 CHANGES
  --- rpm/CHANGES	21 Aug 2010 21:37:36 -0000	1.3296.2.62
  +++ rpm/CHANGES	23 Aug 2010 13:54:42 -0000	1.3296.2.63
  @@ -1,4 +1,6 @@
   5.3.2 -> 5.3.3:
  +    - jbj: grep: leave rpmgrep internal, autopoint gets heartburn.
  +    - jbj: pcre: upgrade to pcre-8.10.
       - jbj: db: upgrade to db-5.0.26.
       - jbj: snapshot rpm-5.3.3 release tarball.
       - jbj: update po files (Translation Project).
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/devtool.conf
  ============================================================================
  $ cvs diff -u -r2.333.2.14 -r2.333.2.15 devtool.conf
  --- rpm/devtool.conf	21 Aug 2010 21:37:36 -0000	2.333.2.14
  +++ rpm/devtool.conf	23 Aug 2010 13:54:42 -0000	2.333.2.15
  @@ -6,7 +6,7 @@
       MODULE_NAMES="db lua pcre syck"	# bash file rc xar xz
       MODULE_TAG_BASH="rpm-5_3"	# XXX bash is GPLv2 and cannot be bundled w RPM
       MODULE_TAG_BEECRYPT=""
  -    MODULE_TAG_DB="db-5_0_26"
  +    MODULE_TAG_DB="rpm-5_3"
       MODULE_TAG_FICL="rpm-5_3"
       MODULE_TAG_FILE="rpm-5_3"
       MODULE_TAG_JS_SRC="rpm-5_3"
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/tools/Makefile.am
  ============================================================================
  $ cvs diff -u -r2.157.2.3 -r2.157.2.4 Makefile.am
  --- rpm/tools/Makefile.am	18 Jun 2010 17:39:48 -0000	2.157.2.3
  +++ rpm/tools/Makefile.am	23 Aug 2010 13:54:43 -0000	2.157.2.4
  @@ -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@
  @@ .