Author: glen Date: Sat Jan 30 05:14:46 2010 GMT Module: packages Tag: HEAD ---- Log message: - up to r4034 snap, crons in subdir
---- Files affected: packages/eventum: eventum-mail-download.cron (1.7 -> 1.8) , eventum-mail-queue.cron (1.8 -> 1.9) , eventum-monitor.cron (1.8 -> 1.9) , eventum-reminder.cron (1.7 -> 1.8) , eventum.spec (1.312 -> 1.313) ---- Diffs: ================================================================ Index: packages/eventum/eventum-mail-download.cron diff -u packages/eventum/eventum-mail-download.cron:1.7 packages/eventum/eventum-mail-download.cron:1.8 --- packages/eventum/eventum-mail-download.cron:1.7 Wed Jan 6 16:58:49 2010 +++ packages/eventum/eventum-mail-download.cron Sat Jan 30 06:14:40 2010 @@ -11,4 +11,4 @@ # # Administration >>> Manage Email Accounts -#0 * * * * http /usr/share/eventum/download_emails.php username_here mail.domain.com INBOX +#0 * * * * http /usr/share/eventum/crons/download_emails.php username_here mail.domain.com INBOX ================================================================ Index: packages/eventum/eventum-mail-queue.cron diff -u packages/eventum/eventum-mail-queue.cron:1.8 packages/eventum/eventum-mail-queue.cron:1.9 --- packages/eventum/eventum-mail-queue.cron:1.8 Wed Jan 6 16:58:49 2010 +++ packages/eventum/eventum-mail-queue.cron Sat Jan 30 06:14:40 2010 @@ -2,7 +2,7 @@ # bounce messages back to root MAILTO=root -* * * * * http /usr/share/eventum/process_mail_queue.php +* * * * * http /usr/share/eventum/crons/process_mail_queue.php # The above line will run the mail queue script every minute. To setup # the SMTP server that Eventum should use to send these queued emails, ================================================================ Index: packages/eventum/eventum-monitor.cron diff -u packages/eventum/eventum-monitor.cron:1.8 packages/eventum/eventum-monitor.cron:1.9 --- packages/eventum/eventum-monitor.cron:1.8 Wed Jan 6 16:58:49 2010 +++ packages/eventum/eventum-monitor.cron Sat Jan 30 06:14:40 2010 @@ -2,4 +2,4 @@ # bounce messages back to root MAILTO=root -*/10 * * * * http /usr/share/eventum/monitor.php +*/10 * * * * http /usr/share/eventum/crons/monitor.php ================================================================ Index: packages/eventum/eventum-reminder.cron diff -u packages/eventum/eventum-reminder.cron:1.7 packages/eventum/eventum-reminder.cron:1.8 --- packages/eventum/eventum-reminder.cron:1.7 Wed Jan 6 16:58:49 2010 +++ packages/eventum/eventum-reminder.cron Sat Jan 30 06:14:40 2010 @@ -2,7 +2,7 @@ # bounce messages back to root MAILTO=root -*/10 * * * * http /usr/share/eventum/check_reminders.php +*/10 * * * * http /usr/share/eventum/crons/check_reminders.php # It is recommended that you run the reminder cron job every 10 minutes, # so it won't flood you with alerts too often, but it would still be ================================================================ Index: packages/eventum/eventum.spec diff -u packages/eventum/eventum.spec:1.312 packages/eventum/eventum.spec:1.313 --- packages/eventum/eventum.spec:1.312 Mon Jan 18 17:11:04 2010 +++ packages/eventum/eventum.spec Sat Jan 30 06:14:40 2010 @@ -11,8 +11,8 @@ %bcond_without order # with experimental order patch #define snap 20060921 -%define rev r4030 -%define rel 2.56 +%define rev r4034 +%define rel 2.58 #define _rc RC3 %define php_min_version 5.1.2 @@ -29,7 +29,7 @@ #Source0: http://mysql.easynet.be/Downloads/eventum/%{name}-%{version}.tar.gz # bzr branch lp:eventum eventum && cd eventum && make dist Source0: %{name}-%{version}-dev-%{rev}.tar.gz -# Source0-md5: a1cb91569360e55a0224bad2ec2113ca +# Source0-md5: 17c325c4a26d8da3f47eb5dcc24b0fe0 Source1: %{name}-apache.conf Source2: %{name}-mail-queue.cron Source3: %{name}-mail-download.cron @@ -93,7 +93,7 @@ BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _noautopear 'pear(init.php)' 'pear(/etc/webapps/.*)' 'pear(%{_appdir}/.*)' 'pear(jpgraph_dir.php)' 'pear(.*Smarty.class.php)' 'pear(Services/JSON.php)' +%define _noautopear 'pear(../init.php)' 'pear(init.php)' 'pear(/etc/webapps/.*)' 'pear(%{_appdir}/.*)' 'pear(jpgraph_dir.php)' 'pear(.*Smarty.class.php)' 'pear(Services/JSON.php)' # exclude optional php dependencies %define _noautophp 'php-gnupg' 'php-hash' 'php-pecl-http' 'php-json' 'php-tk' @@ -442,6 +442,9 @@ %prep %setup -q +# GPL v2 +rm docs/COPYING + rm -r upgrade/*v1.[123]* # too old to support in PLD Linux rm -r upgrade/v{1.,2.0,2.1_}* # no longer supported in PLD Linux rm upgrade/flush_compiled_templates.php @@ -655,7 +658,8 @@ %triggerun -- lighttpd %webapp_unregister lighttpd %{_webapp} -%triggerpostun -- %{name} < 2.2-2.54 +%triggerpostun -- %{name} < 2.2-2.57 +# switching eventum->http user chgrp http %{_webappdir}/config.php chgrp http %{_webappdir}/private_key.php chgrp http %{_webappdir}/setup.php @@ -666,6 +670,19 @@ rm -f $a.rpmtmp done +# crontabs moved to crons subdir +%{__sed} -i -e ' + s,/usr/share/eventum/process_mail_queue.php,/usr/share/eventum/crons/process_mail_queue.php, + s,/usr/share/eventum/download_emails.php,/usr/share/eventum/crons/download_emails.php, + s,/usr/share/eventum/check_reminders.php,/usr/share/eventum/crons/check_reminders.php, + s,/usr/share/eventum/monitor.php,/usr/share/eventum/crons/monitor.php, +' /etc/cron.d/eventum-* + +%triggerpostun mail-download -- %{name}-mail-download < 2.2-2.57 +%triggerpostun reminder -- %{name}-reminder < 2.2-2.57 +%triggerpostun monitor -- %{name}-monitor < 2.2-2.57 + + %files -f %{name}.lang %defattr(644,root,root,755) %doc docs/* htdocs/setup/schema.sql mysql-permissions.sql @@ -683,6 +700,7 @@ %dir %attr(750,root,root) /var/log/archive/%{name} %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/%{name} +%dir %{_appdir}/crons %{_appdir}/init.php %dir %{_appdir}/htdocs %{_appdir}/htdocs/*.php @@ -732,23 +750,23 @@ %files mail-queue %defattr(644,root,root,755) -%attr(755,root,root) %{_appdir}/process_mail_queue.php +%attr(755,root,root) %{_appdir}/crons/process_mail_queue.php %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/cron.d/%{name}-mail-queue %files mail-download %defattr(644,root,root,755) -%attr(755,root,root) %{_appdir}/download_emails.php +%attr(755,root,root) %{_appdir}/crons/download_emails.php %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/cron.d/%{name}-mail-download %files reminder %defattr(644,root,root,755) -%attr(755,root,root) %{_appdir}/check_reminders.php +%attr(755,root,root) %{_appdir}/crons/check_reminders.php %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/cron.d/%{name}-reminder %files monitor %defattr(644,root,root,755) %{_appdir}/lib/eventum/class.monitor.php -%attr(755,root,root) %{_appdir}/monitor.php +%attr(755,root,root) %{_appdir}/crons/monitor.php %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/cron.d/%{name}-monitor %files route-drafts @@ -794,6 +812,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.313 2010/01/30 05:14:40 glen +- up to r4034 snap, crons in subdir + Revision 1.312 2010/01/18 16:11:04 glen - up to r4030, update for new depsolver ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/eventum/eventum-mail-download.cron?r1=1.7&r2=1.8&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/eventum/eventum-mail-queue.cron?r1=1.8&r2=1.9&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/eventum/eventum-monitor.cron?r1=1.8&r2=1.9&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/eventum/eventum-reminder.cron?r1=1.7&r2=1.8&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/eventum/eventum.spec?r1=1.312&r2=1.313&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
