thomas: server obmtool.conf,1.244,1.245

[cvs at kolab.org]

Author: thomas

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

Modified Files:
	obmtool.conf 
Log Message:
Adjusted obmtool.conf


Index: obmtool.conf
===================================================================
RCS file: /kolabrepository/server/obmtool.conf,v
retrieving revision 1.244
retrieving revision 1.245
diff -u -d -r1.244 -r1.245
--- obmtool.conf	15 Mar 2007 21:44:33 -0000	1.244
+++ obmtool.conf	13 Apr 2007 17:30:16 -0000	1.245
@@ -24,14 +24,14 @@
 
 %kolab
     echo "---- boot/build ${NODE} %${CMD} ----"
-    kolab_version="2.1rc1";
+    kolab_version="2.1rc1+cvs";
     PREFIX=/${CMD};
     loc='' # '' (empty) for ftp.openpkg.org, '=' for URL, './' for CWD or absolute path
     plusloc='+'
     altloc='='
     with_genuine=no
 
-    # Check for presence of libgcrypt in the host system
+    # Check for presence of libgcrypt development files in the host system
     libgcrypt_pfx=`eval libgcrypt-config --prefix 2>/dev/null`;
     if test -n "$libgcrypt_pfx" ; then
 	echo "libgcrypt installation in $libgcrypt_pfx detected";
@@ -52,10 +52,11 @@
       $PREFIX/bin/openpkg register --mode=post --user=$USERNAME
       $PREFIX/bin/openpkg register --printstatus && echo "Please associate the instance now. Then RETURN to continue." && read DUMMY
     fi
-	# Get rid of gdbm
-	@wiperpm gdbm-1.8.3-2.5.0
-	@wiperpm dbtool-1.6-2.5.0
-	$PREFIX/bin/openpkg rpm -e --nodeps gdbm dbtool
+
+    # Get rid of gdbm
+    @wiperpm gdbm-1.8.3-2.5.0
+    @wiperpm dbtool-1.6-2.5.0
+    $PREFIX/bin/openpkg rpm -e --nodeps gdbm dbtool
 
     @install ${loc}make-3.80-2.5.0
     @install ${loc}binutils-2.16.1-2.5.1
@@ -120,7 +121,7 @@
     @install ${loc}patch-2.5.9-2.5.0
     @install ${loc}sed-4.1.4-2.5.0
     @install ${loc}libxml-2.6.22-2.5.0
-    @install ${loc}libxslt-1.1.15-2.5.1 # WARNING: Remove libgcrypt before building!
+    @install ${loc}libxslt-1.1.15-2.5.1 # WARNING: Remove libgcrypt development files before building!
     @trigger ${altloc}apache-1.3.33-2.5.6_kolab2 \
 	--without=gdbm_ndbm \
 	--with=mod_auth_ldap \
@@ -151,7 +152,7 @@
     @install ${loc}spamassassin-3.1.0-2.5.0
     @install ${plusloc}amavisd-2.3.3-2.5.0
     @trigger ${loc}curl-7.15.0-2.5.2
-	@install ${loc}bc-1.06-2.5.0
+    @install ${loc}bc-1.06-2.5.0
     @install ${loc}pkgconfig-0.19-2.5.0
     @install ${altloc}clamav-0.90-20070214_kolab
     @install ${altloc}perl-kolab-5.8.7-20070302