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: 12-Jul-2004 16:54:27
Branch: OPENPKG_2_1_SOLID Handle: 2004071215542700
Modified files: (Branch: OPENPKG_2_1_SOLID)
openpkg-src/kolab kolab.spec
Log:
MFC: remove dependency to apache::with_mod_php_pear; remove "lastmod"
setting from slapd.conf.template to support later versions of OpenLDAP
Summary:
Revision Changes Path
1.30.2.2 +2 -1 openpkg-src/kolab/kolab.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/kolab/kolab.spec
============================================================================
$ cvs diff -u -r1.30.2.1 -r1.30.2.2 kolab.spec
--- openpkg-src/kolab/kolab.spec 2 Jul 2004 15:25:40 -0000 1.30.2.1
+++ openpkg-src/kolab/kolab.spec 12 Jul 2004 14:54:27 -0000 1.30.2.2
@@ -59,7 +59,7 @@
PreReq: gdbm >= 1.8.3-2.1.0, gdbm::with_ndbm = yes
PreReq: postfix >= 2.0.16-2.1.0, postfix::with_ldap = yes, postfix::with_sasl
= yes, postfix::with_ssl = yes
PreReq: imapd >= 2.2.3-2.1.0, imapd::with_group = yes
-PreReq: apache >= 1.3.29-2.1.0, apache::with_gdbm_ndbm = yes,
apache::with_mod_auth_ldap = yes, apache::with_mod_dav = yes, apache::with_mod_php =
yes, apache::with_mod_php_gdbm = yes, apache::with_mod_php_gettext = yes,
apache::with_mod_php_imap = yes, apache::with_mod_php_openldap = yes,
apache::with_mod_php_xml = yes, apache::with_mod_php_pear = yes, apache::with_mod_ssl
= yes
+PreReq: apache >= 1.3.29-2.1.0, apache::with_gdbm_ndbm = yes,
apache::with_mod_auth_ldap = yes, apache::with_mod_dav = yes, apache::with_mod_php =
yes, apache::with_mod_php_gdbm = yes, apache::with_mod_php_gettext = yes,
apache::with_mod_php_imap = yes, apache::with_mod_php_openldap = yes,
apache::with_mod_php_xml = yes, apache::with_mod_ssl = yes
%if "%{with_genuine}" == "no"
PreReq: perl-kolab, perl-db
%endif
@@ -138,6 +138,7 @@
%endif
%{l_shtool} subst \
-e 's;var/openldap/\(sl[aur]*pd.pid\);var/openldap/run/\1;' \
+ -e 's;^lastmod.*on$;;' \
slapd.conf.template
%build
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
