steffen: server obmtool,1.5,1.6 obmtool.conf,1.117,1.118

[cvs at intevation.de]

Author: steffen

Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv25249

Modified Files:
	obmtool obmtool.conf 
Log Message:
updated dependencies for new kolabd package name, upgraded obmtool to 1.40

Index: obmtool
===================================================================
RCS file: /kolabrepository/server/obmtool,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- obmtool	4 Sep 2004 11:36:14 -0000	1.5
+++ obmtool	23 Nov 2004 21:43:44 -0000	1.6
@@ -3,7 +3,7 @@
 ##  obmtool -- OpenPKG poor man's Boot, Build & Management Tool
 ##  based on Ralf S. Engelschall's "devtool -- Development Tool"
 ##  Copyright (c) 2003 Thomas Lotterer <thomas at lotterer.net>
-##   Id: obmtool,v 1.39 2004/05/24 15:58:02 thl cvs.ZfOS.org
+##   Id: obmtool,v 1.40 2004/11/18 14:29:18 thl cvs.ZfOS.org
 ##  $Id$
 ##
 
@@ -615,7 +615,7 @@
                 MD5DB=`${MPX} ${RPM} -q  --qf '%{SIGMD5}' ${PKG}`
                 if [ ".$MD5QP" != ".$MD5DB" ]; then
                     echo "obmtool:WARNING: replacing installed ${PKG} with same name-version-release file having different message digest" 1>&2
-                    ${MPX} ${RPM} -Uvh --oldpackage --nodeps ${PREFIX}/RPM/PKG/${PKG}.${ARCH}-${OS}-${TAG}.rpm 2>&1 | tee /tmp/${PRG}-${PKG}.install.log
+                    ${MPX} ${RPM} -Uvh --force --nodeps ${PREFIX}/RPM/PKG/${PKG}.${ARCH}-${OS}-${TAG}.rpm 2>&1 | tee /tmp/${PRG}-${PKG}.install.log
                 fi
             fi
         else

Index: obmtool.conf
===================================================================
RCS file: /kolabrepository/server/obmtool.conf,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -d -r1.117 -r1.118
--- obmtool.conf	23 Nov 2004 11:48:11 -0000	1.117
+++ obmtool.conf	23 Nov 2004 21:43:44 -0000	1.118
@@ -119,8 +119,8 @@
     @install ${plusloc}clamav-0.80-2.2.0
     #@install ${loc}vim-6.3.11-2.1.0
     #@install ${loc}dcron-2.9-20040207
-    @install ${altloc}kolab-1.9.2-20041123 --without=genuine
-    @install ${altloc}kolab-webadmin-0.3.4-20041122
+    @install ${altloc}kolabd-1.9.3-20041123 --without=genuine
+    @install ${altloc}kolab-webadmin-0.3.4-20041123
     @install ${altloc}kolab-resource-handlers-0.3.9-20041123
     @check