richard: server/kolabd/kolabd/dist_conf common, 1.15, 1.16 kolab, 1.19, 1.20 suse, 1.20, 1.21

[cvs at intevation.de]

Author: richard

Update of /kolabrepository/server/kolabd/kolabd/dist_conf
In directory doto:/tmp/cvs-serv5857/dist_conf

Modified Files:
	common kolab suse 
Log Message:
Introduced RPM variable



Index: common
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/common,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- common	15 Jan 2006 20:32:47 -0000	1.15
+++ common	15 Jan 2006 20:56:28 -0000	1.16
@@ -16,6 +16,7 @@
 	-e 's,[@]LDAPD[@],$(LDAPD),g' \
 	-e 's,[@]PERL[@],$(PERL),g' \
 	-e 's,[@]PHP[@],$(PHP),g' \
+	-e 's,[@]RPM[@],$(RPM),g' \
 	-e 's,[@]VERSION[@],$(VERSION),g' \
 	-e 's,[@]WITHOPENPKG[@],$(WITHOPENPKG),g' \
 	-e 's,[@]restricted_kolab_grp[@],$(restricted_kolab_grp),g' \

Index: kolab
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/kolab,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- kolab	15 Jan 2006 20:32:47 -0000	1.19
+++ kolab	15 Jan 2006 20:56:28 -0000	1.20
@@ -21,6 +21,7 @@
 PERL=${bindir}/perl
 PHP=${bindir}/php
 KOLABRC=${bindir}/openpkg
+RPM=${KOLABRC} rpm
 
 # Define the deamons that are executed with openpkg rc
 LDAPD=openldap

Index: suse
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/suse,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- suse	15 Jan 2006 20:32:47 -0000	1.20
+++ suse	15 Jan 2006 20:56:28 -0000	1.21
@@ -12,6 +12,7 @@
 KOLABRC=${sbindir}/kolabsrv
 PERL=${bindir}/perl
 PHP=${bindir}/php
+RPM=/bin/rpm
 
 # Define the deamons that are launched from /etc/init.d
 LDAPD=ldap