rpms/moodle/F-10 moodle-cron,1.3,1.4 moodle.spec,1.37,1.38

[Jon Ciesla]

Author: limb

Update of /cvs/pkgs/rpms/moodle/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21031

Modified Files:
	moodle-cron moodle.spec 
Log Message:
Fixes for magpierss, cron.



Index: moodle-cron
===================================================================
RCS file: /cvs/pkgs/rpms/moodle/F-10/moodle-cron,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- moodle-cron	31 Oct 2008 14:32:22 -0000	1.3
+++ moodle-cron	23 Feb 2009 18:26:40 -0000	1.4
@@ -1,3 +1,3 @@
 #!/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 ] && /usr/bin/php /var/www/moodle/web/admin/cron.php


Index: moodle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moodle/F-10/moodle.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- moodle.spec	11 Feb 2009 21:06:30 -0000	1.37
+++ moodle.spec	23 Feb 2009 18:26:40 -0000	1.38
@@ -7,7 +7,7 @@
 
 Name:           moodle
 Version:        1.9.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A Course Management System
 
 Group:          Applications/Publishing
@@ -111,7 +111,7 @@
 Requires:       perl(HTML::Entities) perl(CGI)
 Requires:	php-Smarty
 Requires:	php-adodb
-Requires:	php-magpierss
+#Requires:	php-magpierss
 Requires:	freefont 
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
@@ -1516,8 +1516,8 @@
 ln -s /usr/share/php/adodb/ $RPM_BUILD_ROOT/var/www/moodle/web/lib/adodb
 
 #use system magpierss
-rm -rf $RPM_BUILD_ROOT/var/www/moodle/web/lib/magpie
-ln -s /usr/share/php/magpierss/ $RPM_BUILD_ROOT/var/www/moodle/web/lib/magpie
+#rm -rf $RPM_BUILD_ROOT/var/www/moodle/web/lib/magpie
+#ln -s /usr/share/php/magpierss/ $RPM_BUILD_ROOT/var/www/moodle/web/lib/magpie
 
 #symlinks for illegal fonts
 ln -s /usr/share/fonts/dejavu/DejaVuSans.ttf $RPM_BUILD_ROOT%{moodlewebdir}/lang/sm_utf8/fonts/default.ttf
@@ -1546,7 +1546,7 @@
 %pre
 rm -rf /var/www/moodle/web/lib/smarty
 rm -rf /var/www/moodle/web/lib/adodb
-rm -rf /var/www/moodle/web/lib/magpie
+#rm -rf /var/www/moodle/web/lib/magpie
 
 %files
 %defattr(-,root,root,-)
@@ -1683,6 +1683,10 @@
 %{_sbindir}/%{name}-cron
 
 %changelog
+* Mon Feb 23 2009 Jon Ciesla <limb at jcomserv.net> - 1.9.4-2
+- Putting back bundled MagpieRSS due to incompatibility, BZ 486777.
+- Corrected moodle-cron.
+
 * Tue Feb 10 2009 Jon Ciesla <limb at jcomserv.net> - 1.9.4-1
 - Update to 1.9.4 to fix CVE-2009-0499,0500,0501,0502.