[Limacute-commit] r146 - trunk/RPM/PKG

[limacute at projects.linpro.no]

Author: limacute
Date: 2007-04-24 01:30:45 +0200 (Tue, 24 Apr 2007)
New Revision: 146

Modified:
   trunk/RPM/PKG/obmtool.conf
Log:
Updated installation config.

Modified: trunk/RPM/PKG/obmtool.conf
===================================================================
--- trunk/RPM/PKG/obmtool.conf	2007-04-23 22:52:11 UTC (rev 145)
+++ trunk/RPM/PKG/obmtool.conf	2007-04-23 23:30:45 UTC (rev 146)
@@ -25,14 +25,14 @@
 
 %kolab
     echo "---- boot/build ${NODE} %${CMD} ----"
-    kolab_version="2.1rc1";
+    kolab_version="2.1rc2";
     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";
@@ -53,10 +53,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
@@ -100,8 +106,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
@@ -111,18 +117,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 \
@@ -130,9 +137,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 \
@@ -143,21 +150,23 @@
 	--with=mbstring
     @install ${altloc}php-smarty-2.6.10-20051003
     @install ${loc}gmp-4.1.4-2.5.0_limacute
-    @install ${loc}spamassassin-3.1.0-2.5.0
+    @install ${altloc}spamassassin-3.1.0-2.5.1_kolab
     @install ${plusloc}amavisd-2.3.3-2.5.0
     @trigger ${loc}curl-7.15.0-2.5.2
-    @install ${altloc}clamav-0.88.7-20061211
+    @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 ${loc}vim-6.3.78-2.4.0
 #    @install ${plusloc}dcron-2.9-2.4.0
     @install ${altloc}perl-kolab-5.8.7-20070117_limacute
     @install ${altloc}kolabd-2.0.99-20070205_limacute --define kolab_version=$kolab_version
     @install ${altloc}kolab-webadmin-2.0.99-20070205_limacute --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-20070117 --define kolab_version=$kolab_version
-    @install ${altloc}kolab-horde-fbview-2.0.99-20070112 --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-20070420 --define kolab_version=$kolab_version
+    @install ${altloc}kolab-horde-fbview-2.1.0-20070420 --define kolab_version=$kolab_version
     @install ${altloc}squirrelmail-1.4.9a-20061203_limacute --with=plugins
     @install ${altloc}postgrey-1.27-2.20060801
-    @install ${altloc}limacute-3.0.2-20070217
+    @install ${altloc}limacute-3.0.4-20070424
 
 
     @check