steffen: server/kolab kolab.spec,1.64,1.65

cvs at intevation.de cvs at intevation.de
Tue Aug 3 13:25:59 CEST 2004


Author: steffen

Update of /kolabrepository/server/kolab
In directory doto:/tmp/cvs-serv14005/kolab

Modified Files:
	kolab.spec 
Log Message:
quotascript improved. dcron is gone from openpkg, so we have to use the systems cron as a stopgap solution...

Index: kolab.spec
===================================================================
RCS file: /kolabrepository/server/kolab/kolab.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -d -r1.64 -r1.65
--- kolab.spec	19 Jul 2004 22:26:14 -0000	1.64
+++ kolab.spec	3 Aug 2004 11:25:57 -0000	1.65
@@ -42,7 +42,7 @@
 Group:        Mail
 License:      GPL
 Version:      1.9.1
-Release:      20040720
+Release:      20040803
 
 #   package options
 %option       with_genuine   no
@@ -54,19 +54,18 @@
 #   build information
 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:       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
-PreReq:       postfix >= 2.1.1-20040507, 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
+BuildPreReq:  OpenPKG, openpkg >= 2.1.0
+PreReq:       OpenPKG, openpkg >= 2.1.0, openldap >= 2.2.14, postfix, imapd, sasl, apache, proftpd, perl, perl-ldap, perl-mail
+PreReq:       sasl >= 2.1.18-2.1.0, sasl::with_ldap = yes, sasl::with_login = yes
+PreReq:       proftpd >= 1.2.10rc3-2.1.0, proftpd::with_ldap = yes
+PreReq:       gdbm >= 1.8.3-2.1.0, gdbm::with_ndbm = yes
+PreReq:       postfix >= 2.1.4-2.1.0, postfix::with_ldap = yes, postfix::with_sasl = yes, postfix::with_ssl = yes
+PreReq:       imapd >= 2.2.6-2.1.0_kolab, imapd::with_group = yes
+PreReq:       apache >= 1.3.31-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 >= 5.8.3-20040618 , perl-db
+PreReq:       perl-kolab >= 5.8.4-20040720, perl-db
 PreReq:	      amavisd
 PreReq:	      clamav
-PreReq:	      dcron
 %endif
 AutoReq:      no
 AutoReqProv:  no
@@ -108,7 +107,7 @@
     %{l_shtool} mkdir -p -m 777 \
         $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/locks
 
-    %{l_shtool} install -c -m 744 %{l_value -s -a} \
+    %{l_shtool} install -c -m 755 %{l_value -s -a} \
         kolab_sslcert.sh kolab_ca.sh kolab kolab_bootstrap workaround.sh \
 	kolabquotawarn \
         $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/
@@ -174,10 +173,10 @@
     rm -rf $RPM_BUILD_ROOT
 
 %post
-    # Install crontab entry for quota warnings
     %{l_shtool} echo -e "Installing crontab entry"
-    %{l_shtool} echo -e "`%{l_prefix}/bin/crontab -l %{l_musr} | grep -v %{l_prefix}/etc/kolab/kolabquotawarn`" \
+    %{l_shtool} echo -e "`crontab -u %{l_musr} -l | grep -v %{l_prefix}/etc/kolab/kolabquotawarn`" \
 	'
-*/10 * * * * %{l_prefix}/etc/kolab/kolabquotawarn' | %{l_prefix}/bin/crontab - -u %{l_musr}
+*/10 * * * * %{l_prefix}/etc/kolab/kolabquotawarn' | crontab -u %{l_musr} - 
+
     echo "please run '$RPM_INSTALL_PREFIX/etc/kolab/kolab_bootstrap -b'"
 





More information about the commits mailing list