RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Anders F. Björklund
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 15-Nov-2007 12:39:37
Branch: HEAD Handle: 2007111511393700
Modified files:
rpm Makefile.am macros.in
Log:
move _repackage_dir, away from %{_topdir} back to %{_var}
Summary:
Revision Changes Path
2.212 +4 -1 rpm/Makefile.am
1.199 +2 -2 rpm/macros.in
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/Makefile.am
============================================================================
$ cvs diff -u -r2.211 -r2.212 Makefile.am
--- rpm/Makefile.am 11 Nov 2007 16:13:36 -0000 2.211
+++ rpm/Makefile.am 15 Nov 2007 11:39:37 -0000 2.212
@@ -140,7 +140,8 @@
install-data-local:
@$(MKDIR_P) $(DESTDIR)$(DBPATH)
- @for dir in BUILD RPMS SOURCES SPECS SRPMS TR; do\
+ @$(MKDIR_P) $(DESTDIR)$(varprefix)/spool/repackage
+ @for dir in BUILD RPMS SOURCES SPECS SRPMS; do\
$(MKDIR_P) $(DESTDIR)$(pkgsrcdir)/$$dir;\
done
@case "@host_cpu@" in \
@@ -194,9 +195,11 @@
done
@$(__CHOWN) ${RPMUSER}.${RPMGROUP} $(DESTDIR)$(pkglibdir)
@$(__CHOWN) -R ${RPMUSER}.${RPMGROUP} $(DESTDIR)$(varprefix)/lib/rpm
+ @$(__CHOWN) -R ${RPMUSER}.${RPMGROUP}
$(DESTDIR)$(varprefix)/spool/repackage
[EMAIL PROTECTED](__CHMOD) 0664 $(DESTDIR)$(varprefix)/lib/rpm/[A-Z]*
[EMAIL PROTECTED](__CHMOD) 0775 $(DESTDIR)$(varprefix)/lib/rpm
[EMAIL PROTECTED](__CHMOD) 0664 $(DESTDIR)$(varprefix)/lib/rpm/__db.*
+ [EMAIL PROTECTED](__CHMOD) 0755 $(DESTDIR)$(varprefix)/spool/repackage
.PHONY: unsetgid
unsetgid:
@@ .
patch -p0 <<'@@ .'
Index: rpm/macros.in
============================================================================
$ cvs diff -u -r1.198 -r1.199 macros.in
--- rpm/macros.in 13 Oct 2007 14:58:21 -0000 1.198
+++ rpm/macros.in 15 Nov 2007 11:39:37 -0000 1.199
@@ -1,7 +1,7 @@
#/*! \page config_macros Default configuration: @USRLIBRPM@/macros
# \verbatim
#
-# $Id: macros.in,v 1.198 2007/10/13 14:58:21 bero Exp $
+# $Id: macros.in,v 1.199 2007/11/15 11:39:37 afb 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
@@ -857,7 +857,7 @@
# The "transactional rollback" directory in which erased packages will
# be saved when using the --repackage option.
-%_repackage_dir %{_topdir}/TR
+%_repackage_dir %{_var}/spool/repackage
# A path (i.e. URL) prefix that is pre-pended to %{_repackage_dir}.
%_repackage_root %{nil}
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
