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:   04-Feb-2008 15:45:27
  Branch: HEAD                             Handle: 2008020414452700

  Modified files:
    rpm                     CHANGES macros.in

  Log:
    - jbj: fix: permit #%patchN comments by forcing single line expansion.

  Summary:
    Revision    Changes     Path
    1.2131      +1  -0      rpm/CHANGES
    1.232       +4  -5      rpm/macros.in
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.2130 -r1.2131 CHANGES
  --- rpm/CHANGES	4 Feb 2008 13:45:37 -0000	1.2130
  +++ rpm/CHANGES	4 Feb 2008 14:45:27 -0000	1.2131
  @@ -1,4 +1,5 @@
   5.0.0 -> 5.1a1:
  +    - jbj: fix: permit #%patchN comments by forcing single line expansion.
       - jbj: document newer macro builtins (%{@foo:...}, %{uuid:...}, and %{lua:...} todo).
       - jbj: fix: poldek in PLD needs replacement for headerGetRawEntry().
       - jbj: add rpmcliWalkFirst() to search (possibly multiple) dirs.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/macros.in
  ============================================================================
  $ cvs diff -u -r1.231 -r1.232 macros.in
  --- rpm/macros.in	3 Feb 2008 20:12:32 -0000	1.231
  +++ rpm/macros.in	4 Feb 2008 14:45:27 -0000	1.232
  @@ -1,7 +1,7 @@
   #/*! \page config_macros Default configuration: @USRLIBRPM@/macros
   # \verbatim
   #
  -# $Id: macros.in,v 1.231 2008/02/03 20:12:32 jbj Exp $
  +# $Id: macros.in,v 1.232 2008/02/04 14:45:27 jbj Exp $
   #
   # This is a global RPM configuration file. All changes made here will
   # be lost when the rpm package is upgraded. Any per-system configuration
  @@ -396,14 +396,13 @@
   # a file and apply using patch(1).
   #
   
  -%patch(b:p:P:REz:F:d:) \
  +%patch(b:p:P:REz:F:d:) %{shrink:\
   %define __patch_number  %{-P:%{-P*}}%{!-P:0} \
   %define __patch_file    %{P:%{__patch_number}} \
   %define __patch_suffix  %{-b:-b --suffix %{-b*}} %{-z:--suffix %{-z*}} \
   %define __patch_options -s %{-p:-p%{-p*}} %{-F:-F%{-F*}} %{-d:-d%{-d*}} %{-R} %{-E} %{__patch_suffix} \
  -echo "Patch #%{__patch_number} (%{basename:%{__patch_file}}):"\
  -%{uncompress:%{__patch_file}} | %{__patch} %{__patch_options}\
  -%{nil}
  +echo "Patch #%{__patch_number} (%{basename:%{__patch_file}}):" && %{uncompress:%{__patch_file}} | %{__patch} %{__patch_options}\
  +}
   
   #
   # Script gets packaged file list on input and buildroot as first parameter.
  @@ .