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-Jul-2007 21:16:35
  Branch: HEAD                             Handle: 2007072220163500

  Modified files:
    rpm/rpmio               macro.c

  Log:
    let's not break %patch instantly again again.

  Summary:
    Revision    Changes     Path
    2.141       +6  -1      rpm/rpmio/macro.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/rpmio/macro.c
  ============================================================================
  $ cvs diff -u -r2.140 -r2.141 macro.c
  --- rpm/rpmio/macro.c	22 Jul 2007 18:40:43 -0000	2.140
  +++ rpm/rpmio/macro.c	22 Jul 2007 19:16:35 -0000	2.141
  @@ -1145,6 +1145,7 @@
   	buf[gn] = '\0';
   	(void) expandU(mb, buf, bufn);
       }
  +#if defined(NOTYET)	/* XXX change needs parsePrep and macros changes too */
       if (fn > 5 && STREQ("patch", f, 5) && xisdigit(f[5])) {
   	/* Skip leading zeros */
   	for (c = 5; c < fn-1 && f[c] == '0' && xisdigit(f[c+1]);)
  @@ -1152,7 +1153,9 @@
   	b = buf;
   	be = stpncpy( stpcpy(b, "%patch -P "), f+c, fn-c);
   	*be = '\0';
  -    } else if (STREQ("basename", f, fn)) {
  +    } else
  +#endif
  +    if (STREQ("basename", f, fn)) {
   	if ((b = strrchr(buf, '/')) == NULL)
   	    b = buf;
   	else
  @@ -1489,6 +1492,7 @@
   	}
   #endif
   
  +#if defined(NOTYET)	/* XXX change needs parsePrep and macros changes too */
   	/* Rewrite "%patchNN ..." as "%patch -P NN ..." and expand. */
   	if (lastc != NULL && fn > 5 && STREQ("patch", f, 5) && xisdigit(f[5])) {
   		/*@-internalglobs@*/ /* FIX: verbose may be set */
  @@ -1497,6 +1501,7 @@
   		s = lastc;
   		continue;
   	}
  +#endif
   
   	/* XXX necessary but clunky */
   	if (STREQ("basename", f, fn) ||
  @@ .