SOURCES: util-vserver-build-poldek.patch - 0.30.208 update

[baggins]

Author: baggins                      Date: Mon Aug 15 09:03:39 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- 0.30.208 update

---- Files affected:
SOURCES:
   util-vserver-build-poldek.patch (1.13 -> 1.14) 

---- Diffs:

================================================================
Index: SOURCES/util-vserver-build-poldek.patch
diff -u SOURCES/util-vserver-build-poldek.patch:1.13 SOURCES/util-vserver-build-poldek.patch:1.14
--- SOURCES/util-vserver-build-poldek.patch:1.13	Mon Aug  8 18:41:21 2005
+++ SOURCES/util-vserver-build-poldek.patch	Mon Aug 15 11:03:34 2005
@@ -252,7 +252,7 @@
    installed. It is suggested to install such a program before setting
    up internal package management."
  		    res=1
-@@ -341,6 +341,125 @@
+@@ -341,6 +341,131 @@
      fi
  }
  
@@ -345,6 +345,10 @@
 +	_copySecure "$vdir" "$RPMETCDIR"   /etc/rpm
 +	_copySecure "$vdir" "$RPMSTATEDIR" /var/lib/rpm
 +
++	pushd "$vdir" >/dev/null
++	    ## remove %_dbpath settings
++	    _substFile /etc/rpm/macros '/^%_dbpath[ \t].*/D'
++	popd >/dev/null
 +    else
 +	if test -n "$have_poldek"; then
 +	    _copySecureRev "$vdir" /etc/poldek "$POLDEKETCDIR"
@@ -353,6 +357,8 @@
 +
 +	_copySecureRev "$vdir" /etc/rpm     "$RPMETCDIR"
 +	_copySecureRev "$vdir" /var/lib/rpm "$RPMSTATEDIR"
++
++	echo -e "%_dbpath\t\t$rpmdb_mntpoint" >>$RPMETCDIR/macros
 +    fi
 +
 +    ## Cleanups...
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/util-vserver-build-poldek.patch?r1=1.13&r2=1.14&f=u