thomas: server/kolabd/kolabd ChangeLog, 1.205, 1.206 kolabd.spec.in, 1.37, 1.38

[cvs at kolab.org]

Author: thomas

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

Modified Files:
	ChangeLog kolabd.spec.in 
Log Message:
kolabd.spec.in: Adjust Adjust crontab entry for kolabquotawarn:

- new location (/kolab/bin instead of /kolab/etc/kolab).
  The "[a-z/]*" part is important for upgrades!
- only try to execute it if it is executable, because the crontab
  entry will not be removed if removing the kolabd package.


Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.205
retrieving revision 1.206
diff -u -d -r1.205 -r1.206
--- ChangeLog	18 Nov 2008 17:50:58 -0000	1.205
+++ ChangeLog	21 Nov 2008 11:36:45 -0000	1.206
@@ -1,3 +1,8 @@
+2008-11-21  Thomas Arendsen Hein  <thomas at intevation.de>
+
+	* kolabd.spec.in: Adjust crontab entry for new location of
+	kolabquotawarn and only try to execute it if it is executable.
+
 2008-11-18  Mathieu Parent <math.parent at gmail.com>
 
 	* kolab.globals.in, dist_conf/{centos-clarkconnect,common,debian,kolab,

Index: kolabd.spec.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolabd.spec.in,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- kolabd.spec.in	12 Nov 2008 17:10:44 -0000	1.37
+++ kolabd.spec.in	21 Nov 2008 11:36:45 -0000	1.38
@@ -128,9 +128,9 @@
     %{l_shtool} echo -e "Installing crontab entry"
 	# NOTE: OpenPKG's dcron package does not work currently, 
 	# so we have to rely on the host system's cron:
-    %{l_shtool} echo -e "`crontab -u %{l_musr} -l | grep -v %{l_prefix}/etc/kolab/kolabquotawarn`" \
+    %{l_shtool} echo -e "`crontab -u %{l_musr} -l | grep -v '%{l_prefix}/[a-z/]*/kolabquotawarn'`" \
 	'
-*/10 * * * * %{l_prefix}/etc/kolab/kolabquotawarn' | crontab - -u %{l_musr}
+*/10 * * * * test -x %{l_prefix}/bin/kolabquotawarn && %{l_prefix}/bin/kolabquotawarn' | crontab - -u %{l_musr}
 
     echo "For a fresh install please initialize Kolab by running '$RPM_INSTALL_PREFIX/sbin/kolab_bootstrap -b' as user root."
     echo "If you upgraded from a previous version simply refresh Kolab by running run '$RPM_INSTALL_PREFIX/sbin/kolabconf' as user root."