steffen: server/kolabd kolabd.spec,1.21,1.22
cvs at intevation.de
cvs at intevation.de
Fri Jan 21 11:39:59 CET 2005
Author: steffen
Update of /kolabrepository/server/kolabd
In directory doto:/tmp/cvs-serv15870
Modified Files:
kolabd.spec
Log Message:
drop the "genuine" option
Index: kolabd.spec
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- kolabd.spec 20 Jan 2005 22:23:46 -0000 1.21
+++ kolabd.spec 21 Jan 2005 10:39:57 -0000 1.22
@@ -40,10 +40,7 @@
Group: Mail
License: GPL
Version: 1.9.4
-Release: 20050120
-
-# package options
-%option with_genuine no
+Release: 20050121
# list of sources
Source0: kolabd-1.9.4.tar.gz
@@ -60,11 +57,9 @@
PreReq: postfix >= 2.1.5-2.2.0, postfix::with_ldap = yes, postfix::with_sasl = yes, postfix::with_ssl = yes
PreReq: imapd >= 2.2.8-2.2.0_kolab, imapd::with_group = yes
PreReq: apache >= 1.3.31-2.2.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 >= 5.8.5-20050120, perl-db
PreReq: amavisd >= 2.1.2-2.2.0_kolab
PreReq: clamav
-%endif
AutoReq: no
AutoReqProv: no
@@ -138,7 +133,6 @@
rootDSE.ldif \
$RPM_BUILD_ROOT%{l_prefix}/etc/kolab/
-%if "%{with_genuine}" == "no"
%{l_shtool} mkdir -p -m 755 \
$RPM_BUILD_ROOT%{l_prefix}/etc/openldap/schema \
$RPM_BUILD_ROOT%{l_prefix}/libexec/kolab
@@ -170,23 +164,13 @@
%{l_shtool} install -c -m 644 %{l_value -s -a} \
kolab2.schema rfc2739.schema \
$RPM_BUILD_ROOT%{l_prefix}/etc/openldap/schema/
-%else
- %{l_shtool} install -c -m 644 %{l_value -s -a} \
- kolab.schema \
- $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/
-%endif
+
# install run-command script
%{l_shtool} mkdir -f -p -m 755 \
$RPM_BUILD_ROOT%{l_prefix}/etc/rc.d
-%if "%{with_genuine}" == "no"
%{l_shtool} install -c -m 755 %{l_value -s -a} \
-e 's;@kolab_daemon@;/sbin/kolabd;' \
%{SOURCE rc.kolabd} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
-%else
- %{l_shtool} install -c -m 755 %{l_value -s -a} \
- -e 's;@kolab_daemon@;/etc/kolab/kolab;' \
- %{SOURCE rc.kolabd} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
-%endif
# generate file list
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} \
More information about the commits
mailing list