steffen: server Makefile,1.8,1.9 obmtool.conf,1.218,1.219

[cvs at intevation.de]

Author: steffen

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

Modified Files:
	Makefile obmtool.conf 
Log Message:
Applied patch for issue1042 from bh and updated versions

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/Makefile,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Makefile	11 Jan 2006 22:45:22 -0000	1.8
+++ Makefile	8 Mar 2006 20:18:40 -0000	1.9
@@ -16,4 +16,3 @@
 	cd kolab-webadmin && make dist
 	cd stage && wget -c `/kolab/bin/openpkg register -R ftp://ftp.openpkg.org/current/SRC/clamav-0.88-20060110.src.rpm`
 	cd stage && cp ../obmtool ../obmtool.conf ../README.1st . && echo "Remember to update obmtool.conf!"
-

Index: obmtool.conf
===================================================================
RCS file: /kolabrepository/server/obmtool.conf,v
retrieving revision 1.218
retrieving revision 1.219
diff -u -d -r1.218 -r1.219
--- obmtool.conf	3 Feb 2006 14:53:56 -0000	1.218
+++ obmtool.conf	8 Mar 2006 20:18:40 -0000	1.219
@@ -4,7 +4,7 @@
 ##  Package listing for Kolab
 ##
 ##  based on Ralf S. Engelschall's "obmtool.conf -- Development Tool Configuration"
-##  Copyright (c) 2004-2005 Steffen Hansen <steffen at klaralvdalens-datakonsult.se>
+##  Copyright (c) 2004-2006 Steffen Hansen <steffen at klaralvdalens-datakonsult.se>
 ##  Copyright (c) 2003 Thomas Lotterer <thomas at lotterer.net>
 ##
 
@@ -24,7 +24,7 @@
 
 %kolab
     echo "---- boot/build ${NODE} %${CMD} ----"
-    kolab_version="2.1beta1";
+    kolab_version="2.1-snapshot-20060308";
     PREFIX=/${CMD};
     loc='' # '' (empty) for ftp.openpkg.org, '=' for URL, './' for CWD or absolute path
     plusloc='+'
@@ -48,7 +48,11 @@
         --muid="19414" --ruid="19415" --nuid="19416" \
         --mgid="19414" --rgid="19415" --ngid="19416"
 
-    @install ${loc}openpkg-registry-0.2.5-20051129
+    @install ${loc}openpkg-registry-0.2.7-20060223
+    if test -n "$USERNAME" ; then
+      $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
     @install ${loc}make-3.80-2.5.0
     @install ${loc}binutils-2.16.1-2.5.0
     @install ${loc}gcc-4.0.2-2.5.0
@@ -137,7 +141,7 @@
 	--with=dom \
 	--with=ssl \
 	--with=mbstring
-    @install ${altloc}php-smarty-2.6.3-20040702
+    @install ${altloc}php-smarty-2.6.10-20051003
     @install ${loc}gmp-4.1.4-2.5.0
     @install ${loc}spamassassin-3.1.0-2.5.0
     @install ${plusloc}amavisd-2.3.3-2.5.0
@@ -145,11 +149,11 @@
     @install ${altloc}clamav-0.88-20060110
 #    @install ${loc}vim-6.3.78-2.4.0
 #    @install ${plusloc}dcron-2.9-2.4.0
-    @install ${altloc}perl-kolab-5.8.7-20060201
-    @install ${altloc}kolabd-2.0.99-20060203 --define kolab_version=$kolab_version
-    @install ${altloc}kolab-webadmin-2.0.99-20060201 --define kolab_version=$kolab_version
-	@install ${altloc}kolab-horde-framework-2.0.99-20051220 --define kolab_version=$kolab_version
-    @install ${altloc}kolab-resource-handlers-2.0.99-20060201 --define kolab_version=$kolab_version
+    @install ${altloc}perl-kolab-5.8.7-20060228
+    @install ${altloc}kolabd-2.0.99-20060228 --define kolab_version=$kolab_version
+    @install ${altloc}kolab-webadmin-2.0.99-20060228 --define kolab_version=$kolab_version
+    @install ${altloc}kolab-horde-framework-2.0.99-20051220 --define kolab_version=$kolab_version
+    @install ${altloc}kolab-resource-handlers-2.0.99-20060308 --define kolab_version=$kolab_version
     @install ${altloc}kolab-horde-fbview-2.0.99-20051220 --define kolab_version=$kolab_version
     @check