OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 21-Apr-2004 11:00:13
Branch: HEAD Handle: 2004042110001200
Modified files:
openpkg-src/kolab kolab.spec
Log:
modify slapd.conf.template to recognize relocation of slapd.pid and
slurpd.pid into new run subdir
Summary:
Revision Changes Path
1.25 +7 -4 openpkg-src/kolab/kolab.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/kolab/kolab.spec
============================================================================
$ cvs diff -u -r1.24 -r1.25 kolab.spec
--- openpkg-src/kolab/kolab.spec 17 Feb 2004 09:52:28 -0000 1.24
+++ openpkg-src/kolab/kolab.spec 21 Apr 2004 09:00:12 -0000 1.25
@@ -40,8 +40,8 @@
Class: PLUS
Group: Mail
License: GPL
-Version: 20040217
-Release: 20040217
+Version: 20040421
+Release: 20040421
# package options
%option with_genuine no
@@ -55,7 +55,7 @@
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20040216
-PreReq: OpenPKG, openpkg >= 20040216, openldap >= 2.2.5-20040212, postfix,
imapd, sasl, apache, proftpd, perl, perl-ldap
+PreReq: OpenPKG, openpkg >= 20040216, openldap >= 2.2.5-20040419, postfix,
imapd, sasl, apache, proftpd, perl, perl-ldap
PreReq: sasl >= 2.1.15-20031122, sasl::with_ldap = yes, sasl::with_login = yes
PreReq: proftpd >= 1.2.9-20031031, proftpd::with_ldap = yes
PreReq: gdbm >= 1.8.3-20030213, gdbm::with_ndbm = yes
@@ -114,7 +114,7 @@
-e "s;\(>Version \).[^<]*<;\1ei-%{V_ei_maj}.%{V_ei_min}<;" \
admin/kolab/index.php
awk <slapd.conf.template \
- '// { if ($1 == "pidfile") { print $0"\nreplica-pidfile
@@@kolab_prefix@@@/var/openldap/slurpd.pid" } else print }' \
+ '// { if ($1 == "pidfile") { print $0"\nreplica-pidfile
@@@kolab_prefix@@@/var/openldap/run/slurpd.pid" } else print }' \
>slapd.conf.template.NEW && mv slapd.conf.template.NEW slapd.conf.template
%{l_shtool} subst \
-e 's;@@@kolab_prefix@@@;@l_prefix@;g' \
@@ -137,6 +137,9 @@
-e 's;\(system("killall -9 slapd >/dev/null 2>&1")\);#\1;' \
kolab_bootstrap
%endif
+ %{l_shtool} subst \
+ -e 's;var/openldap/\(sl[aur]*pd.pid\);var/openldap/run/\1;' \
+ slapd.conf.template
%build
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
