steffen: server/kolabd kolabd.spec,1.45,1.46

[cvs at intevation.de]

Author: steffen

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

Modified Files:
	kolabd.spec 
Log Message:
message templates for amavis, new postfix config param for ldap table

Index: kolabd.spec
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- kolabd.spec	17 May 2005 10:25:19 -0000	1.45
+++ kolabd.spec	20 May 2005 00:39:25 -0000	1.46
@@ -40,7 +40,7 @@
 Group:        Mail
 License:      GPL
 Version:      1.9.4
-Release:      20050516
+Release:      20050520
 
 #   list of sources
 Source0:      kolabd-1.9.4.tar.gz
@@ -50,11 +50,11 @@
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
 BuildPreReq:  OpenPKG, openpkg >= 2.0.0
-PreReq:       OpenPKG, openpkg >= 2.2.0, openldap >= 2.2.17, postfix >= 2.1.5-2.2.0_kolab, imapd, sasl, apache, proftpd, perl, perl-ldap, perl-mail
+PreReq:       OpenPKG, openpkg >= 2.2.0, openldap >= 2.2.17, imapd, sasl, apache, proftpd, perl, perl-ldap, perl-mail
 PreReq:       sasl >= 2.1.19-2.2.0, sasl::with_ldap = yes, sasl::with_login = yes
 PreReq:       proftpd >= 1.2.10-2.2.0, proftpd::with_ldap = yes
 PreReq:       gdbm >= 1.8.3-2.2.0, gdbm::with_ndbm = yes
-PreReq:       postfix >= 2.1.5-2.2.0, postfix::with_ldap = yes, postfix::with_sasl = yes, postfix::with_ssl = yes
+PreReq:       postfix >= 2.1.5-2.2.0_kolab2, 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
 PreReq:       perl-kolab >= 5.8.5-20050503, perl-db
@@ -95,6 +95,8 @@
 
     %{l_shtool} mkdir -p -m 755 \
         $RPM_BUILD_ROOT%{l_prefix}/etc/kolab \
+        $RPM_BUILD_ROOT%{l_prefix}/etc/amavisd/templates/en_US \
+        $RPM_BUILD_ROOT%{l_prefix}/etc/amavisd/templates/de \
         $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates \
         $RPM_BUILD_ROOT%{l_prefix}/var/kolab/log \
         $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/cgi-bin \
@@ -170,6 +172,14 @@
     %{l_shtool} install -c -m 644 %{l_value -s -a} \
         kolab2.schema rfc2739.schema \
         $RPM_BUILD_ROOT%{l_prefix}/etc/openldap/schema/
+
+    %{l_shtool} install -c -m 644 %{l_value -s -a} \
+        amavisd/en_US/* \
+        $RPM_BUILD_ROOT%{l_prefix}/etc/amavisd/templates/en_US/
+
+    %{l_shtool} install -c -m 644 %{l_value -s -a} \
+        amavisd/de/* \
+        $RPM_BUILD_ROOT%{l_prefix}/etc/amavisd/templates/de/
 
     %{l_shtool} install -c -m 644 %{l_value -s -a} \
         doc/README.* \