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:   17-Aug-2007 20:11:43
  Branch: HEAD                             Handle: 2007081719114300

  Modified files:
    rpm/lib                 rpmte.c

  Log:
    p->NEVRA includes A now, so te->NEVRA need not append arch.

  Summary:
    Revision    Changes     Path
    2.49        +4  -0      rpm/lib/rpmte.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/lib/rpmte.c
  ============================================================================
  $ cvs diff -u -r2.48 -r2.49 rpmte.c
  --- rpm/lib/rpmte.c	3 Aug 2007 18:29:53 -0000	2.48
  +++ rpm/lib/rpmte.c	17 Aug 2007 18:11:43 -0000	2.49
  @@ -157,8 +157,10 @@
   	nb += sizeof("pubkey");
       else if (p->isSource)
   	nb += sizeof("src");
  +#ifdef	DYING	/* p->NEVRA includes arch now. */
       else
   	nb += strlen(p->arch) + 1;
  +#endif
       t = xmalloc(nb);
       p->NEVRA = t;
       *t = '\0';
  @@ -167,8 +169,10 @@
   	t = stpcpy( t, ".pubkey");
       else if (p->isSource)
   	t = stpcpy( t, ".src");
  +#ifdef	DYING	/* p->NEVRA includes arch now. */
       else
   	t = stpcpy( stpcpy( t, "."), p->arch);
  +#endif
   
       ep = NULL;
       xx = hge(h, RPMTAG_EPOCH, NULL, &ep, NULL);
  @@ .