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 03:33:34
  Branch: HEAD                             Handle: 2007072202333400

  Modified files:
    rpm                     macros.in

  Log:
    revert 1.175 and 1.174.

  Summary:
    Revision    Changes     Path
    1.183       +7  -10     rpm/macros.in
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/macros.in
  ============================================================================
  $ cvs diff -u -r1.182 -r1.183 macros.in
  --- rpm/macros.in	17 Jul 2007 20:14:13 -0000	1.182
  +++ rpm/macros.in	22 Jul 2007 01:33:34 -0000	1.183
  @@ -1,7 +1,7 @@
   #/*! \page config_macros Default configuration: @USRLIBRPM@/macros
   # \verbatim
   #
  -# $Id: macros.in,v 1.182 2007/07/17 20:14:13 rse Exp $
  +# $Id: macros.in,v 1.183 2007/07/22 01:33:34 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
  @@ -384,17 +384,14 @@
   
   #
   # The patch macro writes 1 line of shell code to (optionally) uncompress
  -# a file and apply using patch(1).
  +# a file and aplly using patch(1).
   #
   
  -%_patch_file    %{P:%{-P:%{-P*}}%{!-P:%%PATCH0}}  
  -%_patch_suffix  %{-b:-b --suffix %{-b*}}%{-z:--suffix %{-z*}}  
  -
  -%__patch_display echo "Patch #%{-P:%{-P*}}%{!-P:0} (%{basename:%_patch_file}):"
  -%__patch_apply   %{uncompress:%_patch_file} | %{__patch} -s %{-p:-p%{-p*}} %{-F:-F%{-F*}} %{-d:-d%{-d*}} %_patch_suffix %{-R} %{-E}
  -
  -%patch(b:p:P:REz:F:d:) %{__patch_display} ; %{__patch_apply} \
  -%{nil}
  +%patch(b:p:P:REz:F:d:) \
  +%define patch_file	%{P:%{-P:%{-P*}}%{!-P:%%PATCH0}} \
  +%define patch_suffix	%{-b:-b --suffix %{-b*}}%{-z:--suffix %{-z*}}
  +  echo "Patch #%{-P:%{-P*}}%{!-P:0} (%{basename:%patch_file}):" \
  +  %{uncompress:%patch_file} | %{__patch} -s %{-p:-p%{-p*}} %{-F:-F%{-F*}} %{-d:-d%{-d*}} %patch_suffix %{-R} %{-E}
   
   #
   # Script gets packaged file list on input and buildroot as first parameter.
  @@ .