From 17ca4b8555f2cb8fe4a832cf7e84facded4b149a Mon Sep 17 00:00:00 2001
From: Jon Ciesla <limb@fedoraproject.org>
Date: Apr 06 2009 16:53:52 +0000
Subject: Probable cron and symlink fixes.


---

diff --git a/moodle-cron b/moodle-cron
index b18f964..2d90c47 100644
--- a/moodle-cron
+++ b/moodle-cron
@@ -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
diff --git a/moodle.spec b/moodle.spec
index e299a40..4de4c6d 100644
--- a/moodle.spec
+++ b/moodle.spec
@@ -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 @@ if [ $1 = 0 ]; then
   /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 @@ fi
 %{_sbindir}/%{name}-cron
 
 %changelog
+* Fri Apr 03 2009 Jon Ciesla <limb@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@jcomserv.net> - 1.9.4-6
 - Patch for CVE-2009-1171, BZ 493109.