gunnar: server obmtool-webclient.conf,1.1,1.2

cvs at kolab.org cvs at kolab.org
Tue May 29 17:24:48 CEST 2007


Author: gunnar

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

Modified Files:
	obmtool-webclient.conf 
Log Message:
Update draft version for the modified obmtool.conf.

Index: obmtool-webclient.conf
===================================================================
RCS file: /kolabrepository/server/obmtool-webclient.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- obmtool-webclient.conf	29 May 2007 15:16:09 -0000	1.1
+++ obmtool-webclient.conf	29 May 2007 15:24:46 -0000	1.2
@@ -11,27 +11,27 @@
 %common
     @hasfeature TAGFMT || exit              # require obmtool to support TAGFMT
     TMPDIR=/var/tmp                            # large tmp with 300MB space
-    URL="" # used for non-ftp://ftp.openpkg.org/ packages
+    URL="ftp://ftp.klaralvdalens-datakonsult.se/pub/kolab/server/current/2.1" # used for non-ftp://ftp.openpkg.org/ packages
     USERNAME=""
     for opt in $cmdargs ; do
         arg=`echo "${opt}" | sed -e 's;^[^=]*=*;;'`
         opt=`echo "${opt}" | sed -e 's;=.*$;;'`
         case $opt in
         -u|--user) USERNAME="$arg";;
-        --url) URL="";;
+        --url) URL="$arg";;
         esac
     done
 
 %kolab
     echo "---- boot/build ${NODE} %${CMD} ----"
-    kolab_version="2.1rc1";
+    kolab_version="2.1.0";
     PREFIX=/${CMD};
-    loc='./' # '' (empty) for ftp.openpkg.org, '=' for URL, './' for CWD or absolute path
-    plusloc='./'
-    altloc='./'
+    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,16 @@
       $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
+
     @install ${loc}make-3.80-2.5.0
     @install ${loc}binutils-2.16.1-2.5.1
     @install ${loc}gcc-4.0.2-2.5.0
-    @install ${loc}fsl-1.6.1-2.5.0
+    @install ${altloc}fsl-1.7.0-2.20070303
     @install ${loc}mm-1.4.0-2.5.0
     @install ${loc}perl-5.8.7-2.5.1
     @install ${loc}perl-openpkg-5.8.7-2.5.0
@@ -99,8 +105,8 @@
     @trigger ${loc}sasl-2.1.21-2.5.0 --with=ldap --with=login
     @install ${loc}getopt-20051005-2.5.0
     @trigger ${loc}proftpd-1.3.0rc2-2.5.0 --with=ldap
-    @install ${loc}gdbm-1.8.3-2.5.0
-    @install ${plusloc}dbtool-1.6-2.5.0
+    #@install ${loc}gdbm-1.8.3-2.5.0
+    #@install ${plusloc}dbtool-1.6-2.5.0
     @trigger ${altloc}postfix-2.2.5-2.5.0_kolab --with=ldap --with=sasl --with=ssl
     @install ${loc}perl-ldap-5.8.7-2.5.0
     @install ${loc}perl-db-5.8.7-2.5.1
@@ -110,18 +116,19 @@
     @install ${loc}autoconf-2.59-2.5.0
     @install ${loc}automake-1.9.6-2.5.0
     @install ${loc}gettext-0.14.5-2.5.0
-    @install ${altloc}file-4.15-2.5.0_kolab
+    @install ${altloc}file-4.15-2.5.0_kolab2
     @install ${loc}openpkg-tools-0.8.47-2.5.0
     @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!
-    @trigger ${altloc}apache-1.3.33-2.5.6_kolab \
+    @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 \
 	--with=mod_dav \
 	--with=mod_php \
 	--with=mod_php_zlib \
-	--with=mod_php_gdbm \
+	--with=mod_php_bdb \
 	--with=mod_php_gettext \
 	--with=mod_php_imap \
 	--with=mod_php_openldap \
@@ -129,9 +136,9 @@
 	--with=mod_php_dom \
 	--with=mod_ssl \
 	--with=mod_php_mbstring
-    @trigger ${altloc}php-4.4.0-2.5.2_kolab \
+    @trigger ${altloc}php-4.4.0-2.5.2_kolab2 \
 	--with=zlib \
-	--with=gdbm \
+	--with=bdb \
 	--with=gettext \
 	--with=imap \
 	--with=openldap \
@@ -142,25 +149,18 @@
 	--with=mbstring
     @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
+    @install ${altloc}spamassassin-3.1.0-2.5.1_kolab
+    @install ${altloc}amavisd-2.3.3-2.5.0_kolab
     @trigger ${loc}curl-7.15.0-2.5.2
-    @install ${altloc}clamav-0.88.7-20061211
-#    @install ${loc}vim-6.3.78-2.4.0
-#    @install ${plusloc}dcron-2.9-2.4.0
-    @install ${altloc}perl-kolab-5.8.7-20070117
-    @install ${altloc}kolabd-2.1_cvs-20070216 --define kolab_version=$kolab_version
-    @install ${altloc}kolab-webadmin-2.1_cvs-20070216 --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.1_cvs-20070124 --define kolab_version=$kolab_version
-    @install ${altloc}kolab-horde-fbview-2.0.99-20070112 --define kolab_version=$kolab_version
-    @check
-
-    if test ! -e "/usr/bin/kolab" ; then
-	echo
-	echo "Adding symbolic link to $PREFIX/bin/kolab as /usr/bin/kolab"
-	ln -s $PREFIX/bin/kolab /usr/bin/kolab
-    fi
+    @install ${loc}bc-1.06-2.5.0
+    @install ${loc}pkgconfig-0.19-2.5.0
+    @install ${altloc}clamav-0.90.2-20070413_kolab
+    @install ${altloc}perl-kolab-5.8.7-20070420
+    @install ${altloc}kolabd-2.1.0-20070510 --define kolab_version=$kolab_version
+    @install ${altloc}kolab-webadmin-2.1.0-20070510 --define kolab_version=$kolab_version
+    @install ${altloc}kolab-horde-framework-2.1.0-20070420 --define kolab_version=$kolab_version
+    @install ${altloc}kolab-resource-handlers-2.1.0-20070510 --define kolab_version=$kolab_version
+    @install ${altloc}kolab-horde-fbview-2.1.0-20070420 --define kolab_version=$kolab_version
     @forcein ${altloc}PEAR-Console_Getopt-1.2.1-1
     @forcein ${altloc}PEAR-Archive_Tar-1.3.2-1
     @forcein ${altloc}PEAR-PEAR-1.4.11-1
@@ -171,16 +171,22 @@
     @install ${altloc}PEAR-Mail_Mime-1.3.1-1
     @install ${altloc}PEAR-Net_Sieve-1.1.5-1
     @install ${altloc}PEAR-Net_Socket-1.0.6-1
-    @install ${altloc}horde-framework-kolab-20070403-1
-    @install ${altloc}horde-kolab-20070319-3
-    @install ${altloc}horde-imp-kolab-20070213-1
-    @install ${altloc}horde-ingo-kolab-20070104-1
-    @install ${altloc}horde-kronolith-kolab-20070201-1
-    @install ${altloc}horde-mnemo-kolab-20070403-1
-    @install ${altloc}horde-nag-kolab-20070403-1
-    @install ${altloc}horde-passwd-kolab-20070104-1
-    @install ${altloc}horde-turba-kolab-20070403-1
+    @install ${altloc}horde-framework-kolab-20070524-1
+    @install ${altloc}horde-kolab-20070524-1
+    @install ${altloc}horde-imp-kolab-20070524-1
+    @install ${altloc}horde-ingo-kolab-20070524-1
+    @install ${altloc}horde-kronolith-kolab-20070528-1
+    @install ${altloc}horde-mnemo-kolab-20070524-1
+    @install ${altloc}horde-nag-kolab-20070528-1
+    @install ${altloc}horde-passwd-kolab-20070524-1
+    @install ${altloc}horde-turba-kolab-20070524-1
+    @check
 
+    if test ! -e "/usr/bin/kolab" ; then
+	echo
+	echo "Adding symbolic link to $PREFIX/bin/kolab as /usr/bin/kolab"
+	ln -s $PREFIX/bin/kolab /usr/bin/kolab
+    fi
 
 
 





More information about the commits mailing list