RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Ralf S. Engelschall
  Root:   /v/rpm/cvs                       Email:  rse@rpm5.org
  Module: rpm                              Date:   28-Dec-2007 10:57:58
  Branch: HEAD                             Handle: 2007122809575800

  Modified files:
    rpm                     VENDOR
    rpm/build               parsePreamble.c

  Log:
    remove this OpenPKG-specific hack now that we have macro stack
    expansion

  Summary:
    Revision    Changes     Path
    2.21        +0  -10     rpm/VENDOR
    2.167       +0  -11     rpm/build/parsePreamble.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/VENDOR
  ============================================================================
  $ cvs diff -u -r2.20 -r2.21 VENDOR
  --- rpm/VENDOR	27 Dec 2007 15:32:31 -0000	2.20
  +++ rpm/VENDOR	28 Dec 2007 09:57:58 -0000	2.21
  @@ -338,14 +338,4 @@
                        arbitrary (or else the macro would be not available).
        Hint:           As %_arbitrary_tags restricts the allowed tags anyway,
                        best would be to export also arbitrary tags as macros!
  -     ________________________________________________________________________
  -
  -     Change:         append-tag-value-to-macro
  -     Purpose:        Instead of overwriting macro "foo" with the latest
  -                     value "quux" in case of tag "Foo: bar" followed
  -                     by tag "Foo: quux", set the macro "foo" to the
  -                     comma-separated list "bar, quux".
  -     Reason:         This allows one to get the values of all(!) tags
  -                     instead of just the last one. In OpenPKG we use this
  -                     to fetch the value of tags like BuildPreReq or NoSource.
   
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/build/parsePreamble.c
  ============================================================================
  $ cvs diff -u -r2.166 -r2.167 parsePreamble.c
  --- rpm/build/parsePreamble.c	27 Dec 2007 15:32:32 -0000	2.166
  +++ rpm/build/parsePreamble.c	28 Dec 2007 09:57:58 -0000	2.167
  @@ -810,18 +810,7 @@
       }
   
       if (macro)
  -#if defined(RPM_VENDOR_OPENPKG) /* append-tag-value-to-macro */
  -    {
  -        char *value = rpmExpand("%{?", macro, ":%{", macro, "}, }", NULL);
  -        size_t value_len = strlen(value);
  -        value = xrealloc(value, value_len + strlen(field) + 1);
  -        strcpy(value+value_len, field);
  -        addMacro(spec->macros, macro, NULL, value, RMIL_SPEC);
  -        value = _free(value);
  -    }
  -#else
   	addMacro(spec->macros, macro, NULL, field, RMIL_SPEC);
  -#endif
       
       return RPMRC_OK;
   }
  @@ .