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:   22-Aug-2008 06:39:02
  Branch: HEAD                             Handle: 2008082204390100

  Modified files:
    rpm                     CHANGES
    rpm/rpmio               macro.c

  Log:
    - WR: mark wrs-rpm-enable-macro-validation.patch (but leave disabled).

  Summary:
    Revision    Changes     Path
    1.2535      +1  -0      rpm/CHANGES
    2.203       +1  -1      rpm/rpmio/macro.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.2534 -r1.2535 CHANGES
  --- rpm/CHANGES	22 Aug 2008 04:34:02 -0000	1.2534
  +++ rpm/CHANGES	22 Aug 2008 04:39:01 -0000	1.2535
  @@ -1,5 +1,6 @@
   
   5.1.0 -> 5.2a0:
  +    - jbj: WR: mark wrs-rpm-enable-macro-validation.patch (but leave disabled).
       - jbj: WR: fix: add rt-reloc-wrapper.sh to EXTRAS_DIST.
       - jbj: rescusitate w make distcheck.
       - jbj: update po files.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/macro.c
  ============================================================================
  $ cvs diff -u -r2.202 -r2.203 macro.c
  --- rpm/rpmio/macro.c	2 Aug 2008 22:37:38 -0000	2.202
  +++ rpm/rpmio/macro.c	22 Aug 2008 04:39:01 -0000	2.203
  @@ -1759,7 +1759,7 @@
   	}
   
   	if (me == NULL) {	/* leave unknown %... as is */
  -#ifndef HACK
  +#if !defined(RPM_VENDOR_WINDRIVER_DEBUG)	/* XXX usually disabled */
   #if DEAD
   		/* XXX hack to skip over empty arg list */
   		if (fn == 1 && *f == '*') {
  @@ .