rpms/moodle/devel moodle-cron,1.4,1.5 moodle.spec,1.42,1.43

[Jon Ciesla]

Author: limb

Update of /cvs/pkgs/rpms/moodle/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12033

Modified Files:
	moodle-cron moodle.spec 
Log Message:
Probable cron and symlink fixes.



Index: moodle-cron
===================================================================
RCS file: /cvs/pkgs/rpms/moodle/devel/moodle-cron,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- moodle-cron	23 Feb 2009 18:01:10 -0000	1.4
+++ moodle-cron	6 Apr 2009 16:53:52 -0000	1.5
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-[ -f /var/lock/subsys/httpd ] && /usr/bin/php /var/www/moodle/web/admin/cron.php
+[ -f /var/lock/subsys/moodle ] && [ -f /var/lock/subsys/httpd ] && /usr/bin/php /var/www/moodle/web/admin/cron.php


Index: moodle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moodle/devel/moodle.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- moodle.spec	1 Apr 2009 19:29:33 -0000	1.42
+++ moodle.spec	6 Apr 2009 16:53:52 -0000	1.43
@@ -8,7 +8,7 @@
 
 Name:           moodle
 Version:        1.9.4
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        A Course Management System
 
 Group:          Applications/Publishing
@@ -1548,7 +1548,7 @@
   /sbin/chkconfig --del %{name}
 fi
 
-%pre
+%pretrans
 if [ -d /var/www/moodle/web/lib/smarty ]; then
   rm -rf /var/www/moodle/web/lib/smarty
 fi
@@ -1694,6 +1694,10 @@
 %{_sbindir}/%{name}-cron
 
 %changelog
+* Fri Apr 03 2009 Jon Ciesla <limb at jcomserv.net> - 1.9.4-7
+- Move symlink scripts from pre to pretrans.
+- Corrented moodle-cron BZ 494090.
+
 * Wed Apr 01 2009 Jon Ciesla <limb at jcomserv.net> - 1.9.4-6
 - Patch for CVE-2009-1171, BZ 493109.