- more 0.30.208 update

[packages/util-vserver.git] / util-vserver-build-poldek.patch

diff --git a/util-vserver-build-poldek.patch b/util-vserver-build-poldek.patch
index 0649c41bbf13be7a0d969caee9986705493e9e2b..5f1f542e852cdae9591e34be3f18635f73a2c5a6 100644 (file)
--- a/util-vserver-build-poldek.patch
+++ b/util-vserver-build-poldek.patch
@@ -2,9 +2,9 @@ diff -urN -x '*~' util-vserver-0.30.207/distrib/Makefile.am util-vserver-0.30.20
 --- util-vserver-0.30.207/distrib/Makefile.am  2005-05-17 17:53:31.514184912 +0200
 +++ util-vserver-0.30.207-poldek/distrib/Makefile.am   2005-05-17 16:39:41.661574720 +0200
 @@ -50,7 +50,8 @@
-                          fc1/apt/sources.list \
                           fc2/apt/sources.list \
                           fc3/apt/sources.list \
+                          fc4/apt/sources.list \
 -                         suse91/apt/sources.list
 +                         suse91/apt/sources.list \
 +                         pld2.0/poldek/poldek.conf
@@ -428,7 +428,7 @@ diff -urN -x '*~' util-vserver-0.30.207/scripts/vpoldek util-vserver-0.30.207-po
 +# along with this program; if not, write to the Free Software
 +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 +
-+: ${UTIL_VSERVER_VARS:=/usr/__LIBDIR/util-vserver/util-vserver-vars}
++: ${UTIL_VSERVER_VARS:=/usr/lib/util-vserver/util-vserver-vars}
 +test -e "$UTIL_VSERVER_VARS" || {
 +    echo $"Can not find util-vserver installation (the file '$UTIL_VSERVER_VARS' would be expected); aborting..." >&2
 +    exit 1
@@ -530,7 +530,7 @@ diff -urN -x '*~' util-vserver-0.30.207/scripts/vpoldek-worker util-vserver-0.30
 +
 +set -e
 +
-+: ${UTIL_VSERVER_VARS:=/usr/__LIBDIR/util-vserver/util-vserver-vars}
++: ${UTIL_VSERVER_VARS:=/usr/lib/util-vserver/util-vserver-vars}
 +test -e "$UTIL_VSERVER_VARS" || {
 +    echo $"Can not find util-vserver installation (the file '$UTIL_VSERVER_VARS' would be expected); aborting..." >&2
 +    exit 1
@@ -651,7 +651,7 @@ diff -urN -x '*~' util-vserver-0.30.207/scripts/vserver-build.functions.poldek u
 diff -urN -x '*~' util-vserver-0.30.207/scripts/vserver-build.poldek util-vserver-0.30.207-poldek/scripts/vserver-build.poldek
 --- util-vserver-0.30.207/scripts/vserver-build.poldek 1970-01-01 01:00:00.000000000 +0100
 +++ util-vserver-0.30.207-poldek/scripts/vserver-build.poldek  2005-05-17 15:47:26.106795288 +0200
-@@ -0,0 +1,61 @@
+@@ -0,0 +1,64 @@
 +# $Id$        --*- sh -*--
 +
 +# Copyright (C) 2003 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
@@ -690,7 +690,8 @@ diff -urN -x '*~' util-vserver-0.30.207/scripts/vserver-build.poldek util-vserve
 +
 +getDistribution
 +
-+base.initVariables
++base.init
++
 +pkgmgmt.initVariables
 +rpm.initVariables
 +poldek.initVariables
@@ -713,3 +714,5 @@ diff -urN -x '*~' util-vserver-0.30.207/scripts/vserver-build.poldek util-vserve
 +$_VPOLDEK "$SETUP_CONFDIR" -- --update-whole
 +poldek.installBasePackages "$SETUP_CONFDIR" "$PKGINSTALLDIR"
 +test -z "$BUILD_INITPOST" || "$BUILD_INITPOST" "$SETUP_CONFDIR" "$UTIL_VSERVER_VARS"
++
++base.setSuccess