richard: server/kolabd/kolabd/dist_conf suse, 1.67, 1.68 common, 1.42, 1.43
cvs at kolab.org
cvs at kolab.org
Mon Feb 11 22:11:56 CET 2008
Author: richard
Update of /kolabrepository/server/kolabd/kolabd/dist_conf
In directory doto:/tmp/cvs-serv7022/dist_conf
Modified Files:
suse common
Log Message:
added autoconf variables for the rpms:
kolab-filter_rpm, kolab-freebusy_rpm, perl-kolab-conf_rpm,
php-pear-kolab_filter_rpm and php-pear-kolab_freebusy_rpm
Index: suse
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/suse,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -d -r1.67 -r1.68
--- suse 31 Jan 2008 15:10:32 -0000 1.67
+++ suse 11 Feb 2008 21:11:54 -0000 1.68
@@ -86,10 +86,15 @@
kolab_rpm=kolab
kolab_resource_handlers_rpm=kolab-resource-handlers
kolab_webadmin_rpm=kolab-webadmin
-perl_kolab_rpm=perl-kolab
kolab_smtpdpolicy_conffile_usr=kolab
kolab_smtpdpolicy_conffile_grp=root
kolab_scriptsdir=$(datadir)/kolab/scripts
+kolab-filter_rpm=kolab-filter
+kolab-freebusy_rpm=kolab-freebusy
+perl_kolab_rpm=perl-kolab
+perl-kolab-conf=perl-kolab-conf
+php-pear-kolab_filter_rpm=php5-pear-kolab_filter
+php-pear-kolab_freebusy_rpm=php5-pear-kolab_freebusy
# This variable makes it possible to store all kolab php modules in its own
# module. E.g on suse it will be /usr/share/php/kolab instead of just
@@ -153,7 +158,7 @@
fbview_logfile=${localstatedir}/log/kolab/fbview.log
freebusy_logdir=${localstatedir}/log/kolab/freebusy
freebusy_confdir=${webserver_document_root}${webserver_web_prefix}/freebusy
-freebusy_cachedir=${webserver_document_root}${webserver_web_prefix}/freebusy/cache
+freebusy_cachedir=${localstatedir}/cache/freebusy
freebusy_usr=wwwrun
freebusy_grp=root
Index: common
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/common,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- common 27 Nov 2007 07:30:24 -0000 1.42
+++ common 11 Feb 2008 21:11:54 -0000 1.43
@@ -77,6 +77,8 @@
-e 's,[@]imap_spool[@],$(imap_spool),g' \
-e 's,[@]imap_statedir[@],$(imap_statedir),g' \
-e 's,[@]imap_usr[@],$(imap_usr),g' \
+ -e 's,[@]kolab-filter_rpm[@],$(kolab-filter_rpm),g' \
+ -e 's,[@]kolab-freebusy_rpm[@],$(kolab-freebusy_rpm),g' \
-e 's,[@]kolab_gid[@],$(kolab_gid),g' \
-e 's,[@]kolab_grp[@],$(kolab_grp),g' \
-e 's,[@]kolab_mailboxuiddb[@],$(kolab_mailboxuiddb),g' \
@@ -86,7 +88,6 @@
-e 's,[@]kolab_php_smarty_prefix[@],$(kolab_php_smarty_prefix),g' \
-e 's,[@]kolab_pidfile[@],$(kolab_pidfile),g' \
-e 's,[@]kolab_rcdir[@],$(kolab_rcdir),g' \
- -e 's,[@]kolab_resource_handlers_rpm[@],$(kolab_resource_handlers_rpm),g' \
-e 's,[@]kolab_rgrp[@],$(kolab_rgrp),g' \
-e 's,[@]kolab_rpm[@],$(kolab_rpm),g' \
-e 's,[@]kolab_rusr[@],$(kolab_rusr),g' \
@@ -112,6 +113,9 @@
-e 's,[@]ldapserver_statedir[@],$(ldapserver_statedir),g' \
-e 's,[@]ldapserver_usr[@],$(ldapserver_usr),g' \
-e 's,[@]perl_kolab_rpm[@],$(perl_kolab_rpm),g' \
+ -e 's,[@]perl-kolab-conf_rpm[@],$(perl-kolab-conf_rpm),g' \
+ -e 's,[@]php-pear-kolab_filter_rpm[@],$(php-pear-kolab_filter_rpm),g' \
+ -e 's,[@]php-pear-kolab_freebusy_rpm[@],$(php-pear-kolab_freebusy_rpm),g' \
-e 's,[@]pkgdocdir[@],$(pkgdocdir),g' \
-e 's,[@]pki_grp[@],$(pki_grp),g' \
-e 's,[@]resmgr_confdir[@],$(resmgr_confdir),g' \
More information about the commits
mailing list