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: 13-Feb-2004 22:53:46
Branch: HEAD Handle: 2004021321534500
Modified files:
openpkg-src/kolab kolab.spec
Log:
genuine kolab does not work with current OpenLDAP ACLs and there is no
official patch/update available. Modify option logic to prefer
alternate engine. Allow user to build with_genuine to get the original
engine
Summary:
Revision Changes Path
1.22 +7 -7 openpkg-src/kolab/kolab.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/kolab/kolab.spec
============================================================================
$ cvs diff -u -r1.21 -r1.22 kolab.spec
--- openpkg-src/kolab/kolab.spec 12 Feb 2004 21:05:24 -0000 1.21
+++ openpkg-src/kolab/kolab.spec 13 Feb 2004 21:53:45 -0000 1.22
@@ -40,11 +40,11 @@
Class: PLUS
Group: Mail
License: GPL
-Version: 20040212
-Release: 20040212
+Version: 20040213
+Release: 20040213
# package options
-%option with_cf no
+%option with_genuine no
# list of sources
Source0:
http://www.erfrakon.de/projects/kolab/download/kolab-server-%{V_ei_maj}/src/kolab-%{V_ei_eng}-%{V_ei_adm}.src.rpm
@@ -62,7 +62,7 @@
PreReq: postfix >= 2.0.16-20031028, postfix::with_ldap = yes,
postfix::with_sasl = yes, postfix::with_ssl = yes
PreReq: imapd >= 2.2.3-20040202, imapd::with_group = yes
PreReq: apache >= 1.3.29-20031124, 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
-%if "%{with_cf}" == "yes"
+%if "%{with_genuine}" == "no"
PreReq: perl-kolab, perl-db
%endif
AutoReq: no
@@ -96,7 +96,7 @@
%setup -q -c -T
%{l_bzip2} -c -d %{SOURCE1} | %{l_tar} xf -
rpm2cpio <%{SOURCE0} | cpio -iv kolab-%{V_ei_maj}.tar.gz
-%if "%{with_cf}" == "yes"
+%if "%{with_genuine}" == "no"
%{l_gzip} -c -d kolab-%{V_ei_maj}.tar.gz | %{l_tar} xf - admin/
mv cfkolab-%{V_cf}/* .
%{l_shtool} subst \
@@ -161,7 +161,7 @@
kolab.conf *.template \
$RPM_BUILD_ROOT%{l_prefix}/etc/kolab/
-%if "%{with_cf}" == "yes"
+%if "%{with_genuine}" == "no"
%{l_shtool} mkdir -p -m 755 \
$RPM_BUILD_ROOT%{l_prefix}/etc/openldap/schema \
$RPM_BUILD_ROOT%{l_prefix}/sbin
@@ -188,7 +188,7 @@
# install run-command script
%{l_shtool} mkdir -f -p -m 755 \
$RPM_BUILD_ROOT%{l_prefix}/etc/rc.d
-%if "%{with_cf}" == "yes"
+%if "%{with_genuine}" == "no"
%{l_shtool} install -c -m 755 %{l_value -s -a} \
-e 's;@kolab_daemon@;/sbin/kolabd;' \
%{SOURCE rc.kolab} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
