steffen: server obmtool,1.4,1.5 obmtool.conf,1.75,1.76
cvs at intevation.de
cvs at intevation.de
Sat Sep 4 13:36:16 CEST 2004
Author: steffen
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv2758
Modified Files:
obmtool obmtool.conf
Log Message:
obmtool updated
Index: obmtool
===================================================================
RCS file: /kolabrepository/server/obmtool,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- obmtool 30 Aug 2004 14:36:55 -0000 1.4
+++ obmtool 4 Sep 2004 11:36:14 -0000 1.5
@@ -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.38 2004/05/05 10:44:07 thl cvs.ZfOS.org
+## Id: obmtool,v 1.39 2004/05/24 15:58:02 thl cvs.ZfOS.org
## $Id$
##
@@ -543,7 +543,6 @@
@fetch ${LOC}/${PKG}.${ARCH:-*}-${OS:-*}-${TAG:-*}.rpm ${PREFIX}/RPM/PKG/ #just to be complete
if [ ! -f ${PREFIX}/RPM/PKG/${PKG}.${ARCH:-*}-${OS:-*}-${TAG:-*}.sh ]; then
echo "obmtool:NOTICE: did not find binary sh. Checking/fetching source sh."
- @locate ${PKG}
@fetch ${LOC}/${PKG}.src.sh ${PREFIX}/RPM/PKG/
@fetch ${LOC}/${PKG}.src.rpm ${PREFIX}/RPM/PKG/ #just to be complete
if [ ! -f ${PREFIX}/RPM/PKG/${PKG}.src.sh ]; then
@@ -943,7 +942,7 @@
if [ ".${TERM}" = .xterm ]; then
SUMMARY="${SUMMARY}]0;NODE=${NODE}; DATE=${DATE}; DONE"
fi
- SUMMARY="${SUMMARY}NODE=${NODE}; DATE=${DATE}; HASX11=${HASX11}; DONE"
+ SUMMARY="${SUMMARY}NODE=${NODE}; CMD=${CMD}; DATE=${DATE}; HASX11=${HASX11}; DONE"
INSTALL="`echo ${INSTALL}`"
MISSSRC="`echo ${MISSSRC}`"
Index: obmtool.conf
===================================================================
RCS file: /kolabrepository/server/obmtool.conf,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -d -r1.75 -r1.76
--- obmtool.conf 2 Sep 2004 06:59:06 -0000 1.75
+++ obmtool.conf 4 Sep 2004 11:36:14 -0000 1.76
@@ -17,6 +17,7 @@
echo "---- boot/build ${NODE} %${CMD} ----"
PREFIX=/${CMD};
loc='' # '' (empty) for ftp.openpkg.org, '=' for URL, './' for CWD or absolute path
+ plusloc='+'
altloc='='
with_genuine=no
@@ -63,7 +64,7 @@
@install ${loc}proftpd-1.2.10rc3-2.1.0 --with=ldap
@install ${loc}pcre-4.5-2.1.0
@install ${loc}gdbm-1.8.3-2.1.0
- @install ${loc}dbtool-1.6-2.1.0
+ @install ${plusloc}dbtool-1.6-2.1.0
@install ${loc}postfix-2.1.4-2.1.2 --with=ldap --with=sasl --with=ssl
@install ${loc}perl-sys-5.8.4-2.1.0
@install ${loc}perl-ldap-5.8.4-2.1.0
@@ -109,11 +110,11 @@
@install ${altloc}php-smarty-2.6.3-20040702
@install ${loc}spamassassin-3.0.0pre2-2.1.0
@install ${loc}amavisd-20030616p10-2.1.1
- @install ${loc}clamav-0.74-2.1.0
+ @install ${plusloc}clamav-0.74-2.1.0
#@install ${loc}vim-6.3.11-2.1.0
#@install ${loc}dcron-2.9-20040207
@install ${altloc}kolab-1.9.2-20040831 --without=genuine
- @install ${altloc}kolab-webadmin-0.3.2-20040901
+ @install ${altloc}kolab-webadmin-0.3.2-20040904
@install ${altloc}kolab-resource-handlers-0.2.5-20040901
@check
More information about the commits
mailing list