[prev in list] [next in list] [prev in thread] [next in thread] 

List:       rpm-cvs
Subject:    [CVS] RPM: rpm-5_1: rpm/ CHANGES rpm/rpmio/ macro.c
From:       "Jeff Johnson" <jbj () rpm5 ! org>
Date:       2008-08-22 4:39:37
Message-ID: 20080822043937.81BD874C5F () rpm5 ! org
[Download RAW message or body]

  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:37
  Branch: rpm-5_1                          Handle: 2008082204393601

  Modified files:           (Branch: rpm-5_1)
    rpm                     CHANGES
    rpm/rpmio               macro.c

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

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

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.2288.2.98 -r1.2288.2.99 CHANGES
  --- rpm/CHANGES	22 Aug 2008 04:35:36 -0000	1.2288.2.98
  +++ rpm/CHANGES	22 Aug 2008 04:39:36 -0000	1.2288.2.99
  @@ -1,4 +1,5 @@
   5.1.4 -> 5.1.5:
  +    - 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.193.2.5 -r2.193.2.6 macro.c
  --- rpm/rpmio/macro.c	18 Jun 2008 18:23:26 -0000	2.193.2.5
  +++ rpm/rpmio/macro.c	22 Aug 2008 04:39:37 -0000	2.193.2.6
  @@ -1751,7 +1751,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 == '*') {
  @@ .
______________________________________________________________________
RPM Package Manager                                    http://rpm5.org
CVS Sources Repository                                rpm-cvs@rpm5.org
[prev in list] [next in list] [prev in thread] [next in thread]