steffen: server obmtool,1.3,1.4 obmtool.conf,1.68,1.69

[cvs at intevation.de]

Author: steffen

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

Modified Files:
	obmtool obmtool.conf 
Log Message:
Now we use openpkg packages directly from ftp.openpkg.org

Index: obmtool
===================================================================
RCS file: /kolabrepository/server/obmtool,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- obmtool	18 May 2004 01:55:39 -0000	1.3
+++ obmtool	30 Aug 2004 14:36:55 -0000	1.4
@@ -543,6 +543,7 @@
                 @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

Index: obmtool.conf
===================================================================
RCS file: /kolabrepository/server/obmtool.conf,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- obmtool.conf	26 Aug 2004 22:11:29 -0000	1.68
+++ obmtool.conf	30 Aug 2004 14:36:55 -0000	1.69
@@ -11,12 +11,13 @@
 %common
     @hasfeature TAGFMT || exit              # require obmtool to support TAGFMT
     TMPDIR=/var/tmp                            # large tmp with 300MB space
-    URL="ftp://ftp.zfos.org/brew/kolab/SRC" # used for non-ftp://ftp.openpkg.org/ packages
+    URL="ftp://ftp.klaralvdalens-datakonsult.se/pub/kolab/server/current/" # used for non-ftp://ftp.openpkg.org/ packages
 
 %kolab
     echo "---- boot/build ${NODE} %${CMD} ----"
     PREFIX=/${CMD};
-    loc='./' # '' (empty) for ftp.openpkg.org, '=' for URL, './' for CWD or absolute path
+    loc='' # '' (empty) for ftp.openpkg.org, '=' for URL, './' for CWD or absolute path
+    altloc='='
     with_genuine=no
 
     # start from scratch or upgrade within 2.0.x
@@ -67,8 +68,8 @@
     @install ${loc}perl-sys-5.8.4-2.1.0
     @install ${loc}perl-ldap-5.8.4-2.1.0
     @install ${loc}perl-db-5.8.4-2.1.0
-    @install ${loc}perl-kolab-5.8.4-20040826
-    @install ${loc}imapd-2.2.6-2.1.0_kolab --with=group --with=ldap --with=annotate --with=atvdom
+    @install ${altloc}perl-kolab-5.8.4-20040826
+    @install ${altloc}imapd-2.2.6-2.1.0_kolab --with=group --with=ldap --with=annotate --with=atvdom
     @install ${loc}m4-1.4.1-2.1.0
     @install ${loc}bison-1.35-2.1.0
     @install ${loc}flex-2.5.4a-2.1.0
@@ -105,15 +106,15 @@
 	--with=xml \
 	--with=dom \
 	--with=ssl	
-    @install ${loc}php-smarty-2.6.3-20040702
+    @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 ${loc}vim-6.3.11-2.1.0
     #@install ${loc}dcron-2.9-20040207
-    @install ${loc}kolab-1.9.2-20040826 --without=genuine
-    @install ${loc}kolab-webadmin-0.3.2-20040826
-    @install ${loc}kolab-resource-handlers-0.2.5-20040826
+    @install ${altloc}kolab-1.9.2-20040826 --without=genuine
+    @install ${altloc}kolab-webadmin-0.3.2-20040826
+    @install ${altloc}kolab-resource-handlers-0.2.5-20040826
     @check
 
 %dump