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:   22-Jul-2007 17:14:49
  Branch: HEAD                             Handle: 2007072216144900

  Modified files:
    rpm                     Makefile.am macros.in

  Log:
    place the 'transactional rollback' directory not inside the RPMS dir
    as its binary RPMS are really special ones. Instead place it into a
    sibling directory to more clearly separate it.

  Summary:
    Revision    Changes     Path
    2.198       +1  -2      rpm/Makefile.am
    1.189       +4  -4      rpm/macros.in
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/Makefile.am
  ============================================================================
  $ cvs diff -u -r2.197 -r2.198 Makefile.am
  --- rpm/Makefile.am	21 Jul 2007 19:30:28 -0000	2.197
  +++ rpm/Makefile.am	22 Jul 2007 15:14:49 -0000	2.198
  @@ -123,7 +123,7 @@
   
   install-data-local:
   	@$(mkinstalldirs) $(DESTDIR)$(DBPATH)
  -	@for dir in BUILD RPMS SOURCES SPECS SRPMS ; do\
  +	@for dir in BUILD RPMS SOURCES SPECS SRPMS TR; do\
   	    $(mkinstalldirs) $(DESTDIR)$(pkgsrcdir)/$$dir;\
   	done
   	@case "@host_cpu@" in \
  @@ -160,7 +160,6 @@
   	*)	$(mkinstalldirs) $(DESTDIR)$(pkgsrcdir)/RPMS/@host_cpu@ ;;\
   	esac
   	$(mkinstalldirs) $(DESTDIR)$(pkgsrcdir)/RPMS/noarch
  -	$(mkinstalldirs) $(DESTDIR)$(pkgsrcdir)/RPMS/repackage
   
   .PHONY:	setperms
   setperms:
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/macros.in
  ============================================================================
  $ cvs diff -u -r1.188 -r1.189 macros.in
  --- rpm/macros.in	22 Jul 2007 11:36:13 -0000	1.188
  +++ rpm/macros.in	22 Jul 2007 15:14:49 -0000	1.189
  @@ -1,7 +1,7 @@
   #/*! \page config_macros Default configuration: @USRLIBRPM@/macros
   # \verbatim
   #
  -# $Id: macros.in,v 1.188 2007/07/22 11:36:13 rse Exp $
  +# $Id: macros.in,v 1.189 2007/07/22 15:14:49 rse 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
  @@ -842,9 +842,9 @@
   # XXX	Note: escaped %% for use in headerSprintf()
   %_repackage_name_fmt	%%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm
   
  -#	The directory in which erased packages will be saved when using
  -#	the --repackage option.
  -%_repackage_dir		%{_rpmdir}/repackage
  +#	The "transactional rollback" directory in which erased packages will
  +#	be saved when using the --repackage option.
  +%_repackage_dir		%{_topdir}/TR
   
   #	A path (i.e. URL) prefix that is pre-pended to %{_repackage_dir}.
   %_repackage_root	%{nil}
  @@ .