[Kolab-devel] Horde Integration CVS updates

[Stephan Buys]

Hi,

I would like to apply the changes below. This lays the base for integrating Horde into
Kolab. Some extra settings in Apache and tweaks in the build and install files to 
integrate it.

I will also add a patch file to the Apache CVS folder which takes care of Pear PHP
integration with the OpenPKG apache files.

Ok to commit?

Regards,
-- 
Stephan 


Index: apache/Makefile
===================================================================
RCS file: /kolabrepository/server/apache/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- apache/Makefile     28 May 2003 19:48:36 -0000      1.6
+++ apache/Makefile     3 Jun 2003 19:11:55 -0000
@@ -12,7 +12,7 @@ endif
 all:

        rpm -ihv $(KOLABPKGURI)/apache-1.3.27-20030516.src.rpm
-       cd $(KOLABRPMSRC)/apache && rpm -ba apache.spec --define 'with_mod_ssl y
es' --define 'with_mod_dav yes' --define 'with_mod_auth_ldap yes' --define 'with
_mod_php_openldap yes' --define 'with_mod_php_imap yes' --define 'with_mod_php y
es' --define 'with_mod_php_gettext yes'
+       cd $(KOLABRPMSRC)/apache && patch < $(KOLABCVSDIR)/server/apache/apache.
spec.patch && rpm -ba apache.spec --define 'with_mod_ssl yes' --define 'with_mod
_dav yes' --define 'with_mod_auth_ldap yes' --define 'with_mod_php yes' --define
 'with_mod_php_ftp yes' --define 'with_mod_php_xml yes' --define 'with_mod_php_d
om yes' --define 'with_mod_php_openldap yes' --define 'with_mod_php_imap yes' --
define 'with_mod_php yes' --define 'with_mod_php_gettext yes'


 clean:
Index: doc/buildkolab.sh
===================================================================
RCS file: /kolabrepository/server/doc/buildkolab.sh,v
retrieving revision 1.9
diff -u -p -r1.9 buildkolab.sh
--- doc/buildkolab.sh   28 May 2003 19:48:36 -0000      1.9
+++ doc/buildkolab.sh   3 Jun 2003 19:11:55 -0000
@@ -2,6 +2,7 @@

 # Script is a contribution from Holger Schröder <holger-kde at holgis.net>
 # Modified by Martin Konold <martin.konold at erfrakon.de>
+# Modified by Stephan Buys <s.buys at codefusion.co.za>
 # licened under the GPL
 #
 # There is currently no support for a $prefix other than /kolab
@@ -95,7 +96,8 @@ echo starting building the rpms...
 for prog in make patch binutils gcc procmail zlib expat readline libiconv \
        perl perl-openpkg perl-ds perl-time perl-xml perl-term perl-crypto \
        perl-conv openssl perl-ssl perl-sys perl-util perl-mail perl-net \
-       perl-www m4 bison flex pcre fsl gdbm mm ncurses sed imap gettext perl-ld
ap; do
+       perl-www m4 bison flex pcre fsl gdbm mm ncurses sed imap gettext \
+       libxml libxslt perl-ldap; do
     exists=`/kolab/bin/rpm -q $prog | grep -v "not installed"`
     echo exists: $exists

Index: doc/getpackages.sh
===================================================================
RCS file: /kolabrepository/server/doc/getpackages.sh,v
retrieving revision 1.2
diff -u -p -r1.2 getpackages.sh
--- doc/getpackages.sh  29 May 2003 12:50:23 -0000      1.2
+++ doc/getpackages.sh  3 Jun 2003 19:11:55 -0000
@@ -40,7 +40,7 @@ for prog in make patch binutils gcc proc
        perl perl-ldap perl-openpkg perl-ds perl-time perl-xml perl-term perl-cr
ypto \
        perl-conv openssl perl-ssl perl-sys perl-util perl-mail perl-net \
        perl-www m4 bison flex pcre fsl gdbm db mm ncurses sed imap gettext \
-       apache db imapd openldap postfix proftpd sasl openpkg; do
+       apache db imapd openldap postfix proftpd sasl openpkg libxml libxslt; do

     if [ "x$prog" = "xopenpkg" ]; then
       file="`grep openpkg- .listing | awk -F" +" '{print $9}' | grep sh`"