rpms/moodle/devel .cvsignore, 1.18, 1.19 moodle-cron, 1.5, 1.6 moodle.spec, 1.46, 1.47 sources, 1.22, 1.23

[Jon Ciesla]

Author: limb

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

Modified Files:
	.cvsignore moodle-cron moodle.spec sources 
Log Message:
New upstream, cron fix.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/moodle/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- .cvsignore	23 Sep 2009 16:47:39 -0000	1.18
+++ .cvsignore	5 Nov 2009 14:52:23 -0000	1.19
@@ -1,4 +1,4 @@
-moodle-weekly-19.tgz
+moodle-1.9.6.tgz
 af_utf8.zip
 ar_utf8.zip
 be_utf8.zip


Index: moodle-cron
===================================================================
RCS file: /cvs/pkgs/rpms/moodle/devel/moodle-cron,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- moodle-cron	6 Apr 2009 16:53:52 -0000	1.5
+++ moodle-cron	5 Nov 2009 14:52:24 -0000	1.6
@@ -1,3 +1,5 @@
 #!/bin/sh
 
 [ -f /var/lock/subsys/moodle ] && [ -f /var/lock/subsys/httpd ] && /usr/bin/php /var/www/moodle/web/admin/cron.php
+[ -f /var/lock/subsys/httpd ] || exit 1
+[ -f /var/lock/subsys/moodle ] && /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.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- moodle.spec	23 Sep 2009 16:47:39 -0000	1.46
+++ moodle.spec	5 Nov 2009 14:52:24 -0000	1.47
@@ -7,16 +7,16 @@
 %define __perl_provides %{nil}
 
 Name:           moodle
-Version:        1.9.5
-Release:        3%{?dist}
+Version:        1.9.6
+Release:        1%{?dist}
 Summary:        A Course Management System
 
 Group:          Applications/Publishing
 License:        GPLv2+
 URL:            http://moodle.org/
-#Source0:        http://download.moodle.org/stable19/%{name}-%{version}.tgz
+Source0:        http://download.moodle.org/stable19/%{name}-%{version}.tgz
 #Using weekly snapshot downloaded 09/23/2009 for new PHP, BZ 525120
-Source0:        http://download.moodle.org/stable19/moodle-weekly-19.tgz
+#Source0:        http://download.moodle.org/stable19/moodle-weekly-19.tgz
 Source1:        moodle.conf
 Source2:        moodle-config.php
 Source3:        moodle.cron
@@ -1722,6 +1722,10 @@ fi
 %exclude %{moodlewebdir}/COPYING.txt
 
 %changelog
+* Thu Nov 05 2009 Jon Ciesla <limb at jcomserv.net> - 1.9.6-1
+- Update to 1.9.6.
+- Make moodle-cron honor lock, BZ 533171.
+
 * Wed Sep 23 2009 Jon Ciesla <limb at jcomserv.net> - 1.9.5-3
 - Using weekly snapshot downloaded 09/23/2009 for new PHP, BZ 525120
 - Added Urdu installer.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/moodle/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- sources	23 Sep 2009 16:47:39 -0000	1.22
+++ sources	5 Nov 2009 14:52:24 -0000	1.23
@@ -1,4 +1,4 @@
-37910e55ed9ada16f0d2d2d06f78647e  moodle-weekly-19.tgz
+40175ce7fbfc720b22110b6a369dec18  moodle-1.9.6.tgz
 3d2971423486ba5503b3b3e9ea2090db  af_utf8.zip
 30f9014a4e84e4b3ab55537fc568e947  ar_utf8.zip
 ae7533b212155cf43bb3cb24280bbc13  be_utf8.zip