--- /usr/share/eventum/irc/bot.php 2005-05-17 23:03:42.000000000 +0300
-+++ ./misc/irc/bot.php 2005-05-24 14:30:35.000000000 +0300
++++ ./irc/eventum-irc-bot 2005-05-24 14:30:35.000000000 +0300
@@ -367,7 +367,7 @@
$irc->setLogdestination(SMARTIRC_FILE);
$irc->setLogfile(APP_IRC_LOG);
---- eventum-r3797/misc/scm/process_cvs_commits.php~ 2009-01-13 14:21:31.000000000 +0200
-+++ eventum-r3797/misc/scm/process_cvs_commits.php 2009-01-13 14:22:25.200134375 +0200
+--- eventum-r3797/scm/eventum-cvs-hook~ 2009-01-13 14:21:31.000000000 +0200
++++ eventum-r3797/scm/eventum-cvs-hook 2009-01-13 14:22:25.200134375 +0200
@@ -27,14 +27,7 @@
// | Authors: João Prado Maia <jpm@mysql.com> |
// +----------------------------------------------------------------------+
if (isset($eventum_url)) {
$data = parse_url($eventum_url);
---- eventum/misc/scm/process_svn_commits.php~ 2007-02-17 20:45:06.580266717 +0200
-+++ eventum/misc/scm/process_svn_commits.php 2007-02-17 20:48:25.014819809 +0200
+--- eventum/scm/eventum-svn-hook~ 2007-02-17 20:45:06.580266717 +0200
++++ eventum/scm/eventum-svn-hook 2007-02-17 20:48:25.014819809 +0200
@@ -33,13 +33,8 @@
// See http://eventum.mysql.org/wiki/index.php/Subversion_integration about SVN integration.
---- eventum-r3475/include/class.language.php~ 2007-11-20 19:11:35.000000000 +0200
-+++ eventum-r3475/include/class.language.php 2007-11-20 19:12:05.696195147 +0200
+--- eventum-r3475/lib/eventum/class.language.php~ 2007-11-20 19:11:35.000000000 +0200
++++ eventum-r3475/lib/eventum/class.language.php 2007-11-20 19:12:05.696195147 +0200
@@ -237,7 +237,6 @@
}
+++ /dev/null
---- eventum/misc/irc/bot.php~ 2007-02-09 00:55:47.199440664 +0200
-+++ eventum/misc/irc/bot.php 2007-02-09 01:39:53.609120026 +0200
-@@ -1,3 +1,4 @@
-+#!/usr/bin/php
- <?php
- /* vim: set expandtab tabstop=4 shiftwidth=4 encoding=utf-8: */
- // +----------------------------------------------------------------------+
-@@ -30,7 +31,7 @@
-
- ini_set('memory_limit', '1024M');
-
--require_once(dirname(__FILE__) . '/../../init.php');
-+require_once('/usr/share/eventum/htdocs/init.php');
-
- if (!file_exists(APP_CONFIG_PATH . 'irc_config.php')) {
- echo "ERROR: No config specified. Please see setup/irc_config.php for config information.\n\n";
if [ ! -f /var/lock/subsys/eventum-irc ]; then
msg_starting "Eventum IRC Bot"
start-stop-daemon --start \
- --exec /usr/sbin/eventum-bot \
+ --exec /usr/sbin/eventum-irc-bot \
--pidfile $PIDFILE \
--chuid eventum \
--background
start
;;
status)
- status eventum-bot php
+ status eventum-irc-bot php
exit $?
;;
*)
---- eventum/misc/route_drafts.php~ 2007-02-15 01:39:42.575673579 +0200
-+++ eventum/misc/route_drafts.php 2007-02-15 01:40:02.046113147 +0200
-@@ -27,6 +27,7 @@
+--- trunk/route_drafts.php~ 2009-06-27 17:36:08.000000000 +0300
++++ trunk/route_drafts.php 2009-06-27 17:36:29.036049928 +0300
+@@ -29,6 +29,7 @@
//
// @(#) $Id$
+ini_set('memory_limit', '1024M');
- require_once(dirname(__FILE__) . "/htdocs/init.php");
- require_once(APP_INC_PATH . "db_access.php");
- require_once(APP_INC_PATH . "class.routing.php");
---- eventum/misc/route_emails.php~ 2007-02-15 01:39:42.575673579 +0200
-+++ eventum/misc/route_emails.php 2007-02-15 01:40:42.017015531 +0200
-@@ -27,6 +27,7 @@
+ require_once 'init.php';
+
+ $full_message = Misc::getInput();
+--- trunk/route_emails.php~ 2009-06-27 17:36:08.000000000 +0300
++++ trunk/route_emails.php 2009-06-27 17:36:57.725685544 +0300
+@@ -29,6 +29,7 @@
//
// @(#) $Id$
+ini_set('memory_limit', '1024M');
- require_once(dirname(__FILE__) . "/htdocs/init.php");
- require_once(APP_INC_PATH . "db_access.php");
- require_once(APP_INC_PATH . "class.routing.php");
---- eventum/misc/route_notes.php~ 2007-02-15 01:39:42.575673579 +0200
-+++ eventum/misc/route_notes.php 2007-02-15 01:41:13.727731426 +0200
-@@ -27,6 +27,7 @@
+ require_once 'init.php';
+
+ $full_message = Misc::getInput();
+--- trunk/route_notes.php~ 2009-06-27 17:36:08.000000000 +0300
++++ trunk/route_notes.php 2009-06-27 17:37:14.485553825 +0300
+@@ -29,6 +29,7 @@
//
// @(#) $Id$
+ini_set('memory_limit', '1024M');
- require_once(dirname(__FILE__) . "/htdocs/init.php");
- require_once(APP_INC_PATH . "db_access.php");
- require_once(APP_INC_PATH . "class.routing.php");
---- eventum-20060830/misc/download_emails.php 2006-09-05 00:11:48.396726556 +0300
-+++ eventum-20060830.mem/misc/download_emails.php 2006-09-05 00:12:09.647203129 +0300
+ require_once 'init.php';
+
+ $full_message = Misc::getInput();
+--- eventum-20060830/download_emails.php 2006-09-05 00:11:48.396726556 +0300
++++ eventum-20060830.mem/download_emails.php 2006-09-05 00:12:09.647203129 +0300
@@ -28,7 +28,7 @@
//
// @(#) $Id$
require_once("/etc/webapps/eventum/core.php");
require_once(APP_INC_PATH . "class.support.php");
---- eventum-20060830/misc/process_mail_queue.php 2006-09-05 00:11:48.396726556 +0300
-+++ eventum-20060830.mem/misc/process_mail_queue.php 2006-09-05 00:12:09.647203129 +0300
+--- eventum-20060830/process_mail_queue.php 2006-09-05 00:11:48.396726556 +0300
++++ eventum-20060830.mem/process_mail_queue.php 2006-09-05 00:12:09.647203129 +0300
@@ -28,7 +28,7 @@
//
// @(#) $Id$
require_once("/etc/webapps/eventum/core.php");
require_once(APP_INC_PATH . "db_access.php");
---- eventum/misc/irc/bot.php~ 2007-01-16 21:24:17.009987152 +0200
-+++ eventum/misc/irc/bot.php 2007-01-16 21:24:57.050882112 +0200
+--- eventum/irc/eventum-irc-bot~ 2007-01-16 21:24:17.009987152 +0200
++++ eventum/irc/eventum-irc-bot 2007-01-16 21:24:57.050882112 +0200
@@ -26,6 +26,6 @@
//
---- eventum-new/ajax/order.php 2008-10-15 02:02:25.000000000 +0300
-+++ eventum-new/ajax/order.php 2008-10-15 02:02:25.000000000 +0300
+--- eventum-new/htdocs/ajax/order.php 2008-10-15 02:02:25.000000000 +0300
++++ eventum-new/htdocs/ajax/order.php 2008-10-15 02:02:25.000000000 +0300
@@ -0,0 +1,72 @@
+<?
+require_once(dirname(__FILE__) . '/../init.php');
+ }
+ }
+}
---- eventum/ajax/update.php 2008-10-15 01:46:20.000000000 +0300
-+++ eventum-new/ajax/update.php 2008-10-15 02:02:25.000000000 +0300
+--- eventum/htdocs/ajax/update.php 2008-10-15 01:46:20.000000000 +0300
++++ eventum-new/htdocs/ajax/update.php 2008-10-15 02:02:25.000000000 +0300
@@ -0,0 +1,30 @@
+<?
+require_once(dirname(__FILE__) . '/../init.php');
+ die('object type not supported');
+ break;
+}
---- eventum/include/class.display_column.php 2008-10-15 01:46:20.000000000 +0300
-+++ eventum-new/include/class.display_column.php 2008-10-15 02:02:25.000000000 +0300
+--- eventum/lib/eventum/class.display_column.php 2008-10-15 01:46:20.000000000 +0300
++++ eventum-new/lib/eventum/class.display_column.php 2008-10-15 02:02:25.000000000 +0300
@@ -229,7 +229,10 @@
),
"iss_expected_resolution_date" => array(
)
);
return $columns[$page];
---- eventum/include/class.issue.php 2008-10-15 01:46:20.000000000 +0300
-+++ eventum-new/include/class.issue.php 2008-10-15 02:02:25.000000000 +0300
+--- eventum/lib/eventum/class.issue.php 2008-10-15 01:46:20.000000000 +0300
++++ eventum-new/lib/eventum/class.issue.php 2008-10-15 02:02:25.000000000 +0300
@@ -1356,6 +1356,7 @@
Error_Handler::logError(array($res->getMessage(), $res->getDebugInfo()), __FILE__, __LINE__);
return -1;
+
}
---- eventum-r3749/js/global.js~ 2008-10-15 02:03:48.000000000 +0300
-+++ eventum-r3749/js/global.js 2008-10-15 02:06:00.000000000 +0300
+--- eventum-r3749/htdocs/js/global.js~ 2008-10-15 02:03:48.000000000 +0300
++++ eventum-r3749/htdocs/js/global.js 2008-10-15 02:06:00.000000000 +0300
@@ -799,4 +799,39 @@
});
});
+});
+
//-->
---- eventum/list.php 2008-10-15 01:46:20.000000000 +0300
-+++ eventum-new/list.php 2008-10-15 02:02:25.000000000 +0300
+--- eventum/htdocs/list.php 2008-10-15 01:46:20.000000000 +0300
++++ eventum-new/htdocs/list.php 2008-10-15 02:02:25.000000000 +0300
@@ -67,6 +67,11 @@
$profile['sort_by'] . "&sort_order=" . $profile['sort_order']);
}
-{include file="footer.tpl.html"}
+{include file="footer.tpl.html"}
\ No newline at end of file
---- ./js/jquery/jquery.tablednd.js (revision 0)
-+++ ./js/jquery/jquery.tablednd.js (revision 0)
+--- ./htdocs/js/jquery/jquery.tablednd.js (revision 0)
++++ ./htdocs/js/jquery/jquery.tablednd.js (revision 0)
@@ -0,0 +1,382 @@
+/**
+ * TableDnD plug-in for JQuery, allows you to drag and drop table rows
+ }
+);
\ No newline at end of file
---- eventum-r3765/templates/header.tpl.html~ 2008-10-28 20:23:04.000000000 +0200
-+++ eventum-r3765/templates/header.tpl.html 2008-10-28 22:39:10.604728264 +0200
+--- trunk/templates/header.tpl.html~ 2009-06-27 16:15:57.000000000 +0300
++++ trunk/templates/header.tpl.html 2009-06-27 16:16:44.992783169 +0300
@@ -8,6 +8,7 @@
- <script language="JavaScript" src="{$rel_url}js/jquery/jquery.js"></script>
- <script language="JavaScript" src="{$rel_url}js/jquery/form.js"></script>
- <script language="JavaScript" src="{$rel_url}js/jquery/ui.datepicker.js"></script>
-+<script language="JavaScript" src="{$rel_url}js/jquery/jquery.tablednd.js"></script>
+ <script type="text/javascript" src="{$rel_url}js/jquery/form.js"></script>
+ <script type="text/javascript" src="{$rel_url}js/jquery/blockui.js"></script>
+ <script type="text/javascript" src="{$rel_url}js/jquery/ui.datepicker.js"></script>
++<script type="text/javascript" src="{$rel_url}js/jquery/jquery.tablednd.js"></script>
<link rel="stylesheet" href="{$rel_url}js/jquery/ui.datepicker.css">
- <script language="JavaScript">
+ <script type="text/javascript">
<!--
---- eventum-r3765/css/style.css~ 2008-06-19 08:30:31.000000000 +0300
-+++ eventum-r3765/css/style.css 2008-10-29 17:28:49.393768970 +0200
+--- eventum-r3765/htdocs/css/style.css~ 2008-06-19 08:30:31.000000000 +0300
++++ eventum-r3765/htdocs/css/style.css 2008-10-29 17:28:49.393768970 +0200
@@ -172,4 +172,9 @@
font-size: 70%;
font-family: Verdana, Arial, Helvetica, sans-serif;
+ background-color: #ffffdd;
+ border: 1px solid red;
+}
---- eventum~/css/style.css 2008-11-06 16:54:30.000000000 +0200
-+++ eventum/css/style.css 2008-11-06 16:20:50.038350957 +0200
+--- eventum~/htdocs/css/style.css 2008-11-06 16:54:30.000000000 +0200
++++ eventum/htdocs/css/style.css 2008-11-06 16:20:50.038350957 +0200
@@ -173,8 +173,21 @@
font-family: Verdana, Arial, Helvetica, sans-serif;
padding: 10px;
-{include file="footer.tpl.html"}
\ No newline at end of file
+{include file="footer.tpl.html"}
---- eventum-r3776/misc/upgrade/update-database.php 2008-11-18 01:10:18.806283202 +0200
-+++ eventum/misc/upgrade/update-database.php 2008-11-18 01:15:20.703082655 +0200
+--- eventum-r3776/upgrade/update-database.php 2008-11-18 01:10:18.806283202 +0200
++++ eventum/upgrade/update-database.php 2008-11-18 01:15:20.703082655 +0200
@@ -83,6 +83,7 @@
1 => '01_notes.php',
2 => '02_usr_alias.php',
// sanity check. check that the version table exists.
--- /dev/null 2008-11-04 20:33:38.146691408 +0200
-+++ eventum/misc/upgrade/patches/04_isu_order.php 2008-11-18 01:14:02.972104347 +0200
++++ eventum/upgrade/patches/04_isu_order.php 2008-11-18 01:14:02.972104347 +0200
@@ -0,0 +1,15 @@
+<?php
+
+
+ return $stmts;
+}
---- ../eventum-old2/ajax/update.php 2008-10-13 11:14:23.673428821 +0300
-+++ ./ajax/update.php 2008-11-19 15:05:54.490054961 +0200
+--- ../eventum-old2/htdocs/ajax/update.php 2008-10-13 11:14:23.673428821 +0300
++++ ./htdocs/ajax/update.php 2008-11-19 15:05:54.490054961 +0200
@@ -16,9 +16,17 @@
case 'expected_resolution_date':
$day = (int)$_POST['day'];
} else {
echo 'update failed';
}
---- eventum_tar/js/global.js 2008-11-06 16:54:30.000000000 +0200
-+++ ./js/global.js 2008-11-19 15:06:21.820071605 +0200
+--- eventum_tar/htdocs/js/global.js 2008-11-06 16:54:30.000000000 +0200
++++ ./htdocs/js/global.js 2008-11-19 15:06:21.820071605 +0200
@@ -817,10 +817,15 @@
function (date, dteObj) {
fieldName = masterObj.id.substr(0,masterObj.id.indexOf('|'));
}, "text");
},
// config
---- eventum-old2/include/class.issue.php 2008-10-15 18:30:31.590172372 +0300
-+++ ./include/class.issue.php 2008-11-19 15:04:43.710659328 +0200
+--- eventum-old2/lib/eventum/class.issue.php 2008-10-15 18:30:31.590172372 +0300
++++ ./lib/eventum/class.issue.php 2008-11-19 15:04:43.710659328 +0200
@@ -1694,7 +1694,11 @@
$stmt .= ", iss_pre_id = " . Misc::escapeInteger($filed_value);
break;
break;
case 'release':
$stmt .= ", iss_pre_id = " . Misc::escapeInteger($filed_value);
---- eventum/include/class.issue.php 2008-10-15 01:46:20.000000000 +0300
-+++ eventum-new/include/class.issue.php 2008-10-15 02:02:25.000000000 +0300
+--- eventum/lib/eventum/class.issue.php 2008-10-15 01:46:20.000000000 +0300
++++ eventum-new/lib/eventum/class.issue.php 2008-10-15 02:02:25.000000000 +0300
@@ -2050,7 +2050,7 @@
" . APP_DEFAULT_DB . "." . APP_TABLE_PREFIX . "issue_user
WHERE
---- eventum-r3833/misc/cli/config.inc.php~ 2009-02-10 09:30:34.000000000 +0200
-+++ eventum-r3833/misc/cli/config.inc.php 2009-02-10 09:31:11.928169361 +0200
-@@ -33,8 +33,7 @@
- set_time_limit(0);
-
- // definitions of path related variables
--define('APP_PATH', dirname(__FILE__) . '/');
--define('APP_INC_PATH', APP_PATH . 'include/');
--define('APP_PEAR_PATH', APP_INC_PATH . 'pear/');
-+define('APP_INC_PATH', '/usr/share/eventum/cli/');
-+define('APP_PEAR_PATH', '/usr/share/pear/');
-
- set_include_path(get_include_path() . PATH_SEPARATOR . APP_PEAR_PATH);
---- eventum/include/class.template_helper.php~ 2007-01-30 18:52:59.020179406 +0200
-+++ eventum/include/class.template_helper.php 2007-01-30 18:53:24.620759076 +0200
-@@ -61,6 +61,7 @@
- $this->smarty = new Smarty;
- $this->smarty->template_dir = APP_TPL_PATH;
- $this->smarty->compile_dir = APP_TPL_COMPILE_PATH;
-+ $this->smarty->plugins_dir = array('/usr/share/eventum/include/smarty', 'plugins');
- $this->smarty->config_dir = '';
- $this->smarty->register_modifier("activateLinks", array('Link_Filter', 'activateLinks'));
- $this->smarty->register_modifier("formatCustomValue", array('Custom_Field', 'formatValue'));
---- ./include/class.monitor.php~ 2005-02-22 21:50:49.000000000 +0200
-+++ ./include/class.monitor.php 2005-02-22 23:04:50.000000000 +0200
+--- ./lib/eventum/class.monitor.php~ 2005-02-22 21:50:49.000000000 +0200
++++ ./lib/eventum/class.monitor.php 2005-02-22 23:04:50.000000000 +0200
@@ -157,6 +165,7 @@
'permission' => 100,
),
foreach ($required_directories as $dir_path => $options) {
// check if directory exists
if (!file_exists($dir_path)) {
---- ./include/class.misc.php 2005-10-26 17:17:17.000000000 +0300
-+++ /tmp/class.misc.php 2005-10-26 17:30:12.000000000 +0300
-@@ -607,7 +607,7 @@
- */
- function highlightQuotedReply($text)
- {
-- require_once(APP_SMARTY_PATH . "plugins/modifier.highlight_quoted.php");
-+ require_once(APP_INC_PATH. "smarty/modifier.highlight_quoted.php");
- return smarty_modifier_highlight_quoted($text);
- }
-
---- eventum-r3615/init.php~ 2008-06-05 00:02:42.833798000 +0300
-+++ eventum-r3615/init.php 2008-06-05 00:02:58.229406819 +0300
+--- trunk/init.php~ 2009-06-27 17:31:32.000000000 +0300
++++ trunk/init.php 2009-06-27 17:33:35.745565456 +0300
@@ -26,7 +26,7 @@
// | Authors: Elan Ruusamäe <glen@delfi.ee> |
// +----------------------------------------------------------------------+
Header('Location: setup/');
exit;
}
-@@ -45,30 +45,30 @@
+@@ -46,7 +46,7 @@
// define base path
--define('APP_PATH', realpath(dirname(__FILE__)) . '/');
--define('APP_CONFIG_PATH', APP_PATH . 'config/');
-+define('APP_PATH', '/usr/share/eventum/htdocs/');
-+define('APP_CONFIG_PATH', '/etc/webapps/eventum/');
-
- // include local site config
- require_once APP_CONFIG_PATH . 'config.php';
-
- // define other paths
- if (!defined('APP_INC_PATH')) {
-- define('APP_INC_PATH', APP_PATH . 'include/');
-+ define('APP_INC_PATH', '/usr/share/eventum/include/');
- }
+ define('APP_PATH', realpath(dirname(__FILE__)));
+-define('APP_CONFIG_PATH', APP_PATH . '/config');
++define('APP_CONFIG_PATH', '/etc/webapps/eventum');
- if (!defined('APP_PEAR_PATH')) {
-- define('APP_PEAR_PATH', APP_INC_PATH . 'pear/');
-+ define('APP_PEAR_PATH', '/usr/share/pear/');
+ // include local site config. may override any default
+ require_once APP_CONFIG_PATH . '/config.php';
+@@ -61,19 +61,15 @@
}
- if (!defined('APP_TPL_PATH')) {
-- define('APP_TPL_PATH', APP_PATH . 'templates/');
-+ define('APP_TPL_PATH', '/usr/share/eventum/templates/');
+ if (!defined('APP_TPL_COMPILE_PATH')) {
+- define('APP_TPL_COMPILE_PATH', APP_PATH . '/templates_c');
++ define('APP_TPL_COMPILE_PATH', '/var/cache/eventum');
}
- if (!defined('APP_TPL_COMPILE_PATH')) {
-- define('APP_TPL_COMPILE_PATH', APP_PATH . 'templates_c');
-+ define('APP_TPL_COMPILE_PATH', '/var/cache/eventum/');
+ if (!defined('APP_INC_PATH')) {
+ define('APP_INC_PATH', APP_PATH . '/lib/eventum');
}
+-if (!defined('APP_PEAR_PATH')) {
+- define('APP_PEAR_PATH', APP_PATH . '/lib/pear');
+-}
+-
if (!defined('APP_SMARTY_PATH')) {
-- define('APP_SMARTY_PATH', APP_INC_PATH . 'Smarty/');
-+ define('APP_SMARTY_PATH', '/usr/share/php/Smarty/');
+- define('APP_SMARTY_PATH', APP_PATH . '/lib/Smarty');
++ define('APP_SMARTY_PATH', '/usr/share/php/Smarty');
}
if (!defined('APP_JPGRAPH_PATH')) {
-@@ -76,7 +76,7 @@
+@@ -81,7 +77,7 @@
}
if (!defined('APP_LOCKS_PATH')) {
-- define('APP_LOCKS_PATH', APP_PATH . 'locks/');
+- define('APP_LOCKS_PATH', APP_PATH . '/locks');
+ define('APP_LOCKS_PATH', '/var/run/eventum/');
}
- if (!defined('APP_SETUP_FILE')) {
-@@ -84,11 +84,11 @@
- }
-
if (!defined('APP_SQL_PATCHES_PATH')) {
-- define('APP_SQL_PATCHES_PATH', APP_PATH . 'misc/upgrade/patches');
-+ define('APP_SQL_PATCHES_PATH', '/usr/share/eventum/upgrade/patches');
+@@ -89,7 +85,7 @@
}
if (!defined('APP_LOG_PATH')) {
-- define('APP_LOG_PATH', APP_PATH . 'logs/');
-+ define('APP_LOG_PATH', '/var/log/eventum/');
+- define('APP_LOG_PATH', APP_PATH . '/logs');
++ define('APP_LOG_PATH', '/var/log/eventum');
}
if (!defined('APP_ROUTED_MAILS_SAVEDIR')) {
---- eventum/setup/index.php~ 2007-01-30 20:04:32.306824546 +0200
-+++ eventum/setup/index.php 2007-01-30 20:14:43.880555938 +0200
-@@ -38,17 +38,17 @@
- set_time_limit(0);
- define('APP_CHARSET', 'UTF-8');
- define('APP_DEFAULT_LOCALE', 'en_US');
--define('APP_PATH', realpath(dirname(__FILE__) . '/..') . '/');
-+define('APP_PATH', realpath(dirname(__FILE__) . '/../..') . '/');
- define('APP_INC_PATH', APP_PATH . 'include/');
- define('APP_PEAR_PATH', APP_INC_PATH . 'pear/');
--define('APP_SMARTY_PATH', APP_INC_PATH . 'Smarty/');
--define('APP_CONFIG_PATH', APP_PATH . 'config/');
-+define('APP_SMARTY_PATH', '/usr/share/php/Smarty/');
-+define('APP_CONFIG_PATH', '/etc/webapps/eventum/');
- define('APP_SETUP_FILE', APP_CONFIG_PATH . 'setup.php');
- define('APP_TPL_PATH', APP_PATH . 'templates/');
--define('APP_TPL_COMPILE_PATH', APP_PATH . 'templates_c');
--define('APP_LOG_PATH', APP_PATH . 'logs/');
+--- trunk/htdocs/setup/index.php~ 2009-06-27 17:34:22.000000000 +0300
++++ trunk/htdocs/setup/index.php 2009-06-27 17:35:07.108898271 +0300
+@@ -42,14 +42,14 @@
+ define('APP_PATH', realpath(dirname(__FILE__) . '/../..'));
+ define('APP_INC_PATH', APP_PATH . '/lib/eventum');
+ define('APP_PEAR_PATH', APP_INC_PATH . '/lib/pear');
+-define('APP_SMARTY_PATH', APP_INC_PATH . '/lib/Smarty');
+-define('APP_CONFIG_PATH', APP_PATH . '/config');
++define('APP_SMARTY_PATH', '/usr/share/php/Smarty');
++define('APP_CONFIG_PATH', '/etc/webapps/eventum');
+ define('APP_SETUP_FILE', APP_CONFIG_PATH . '/setup.php');
+ define('APP_TPL_PATH', APP_PATH . '/templates');
+-define('APP_TPL_COMPILE_PATH', APP_PATH . '/templates_c');
+-define('APP_LOG_PATH', APP_PATH . '/logs');
+define('APP_TPL_COMPILE_PATH', '/var/cache/eventum');
-+define('APP_LOG_PATH', '/var/log/eventum/');
- define('APP_ERROR_LOG', APP_LOG_PATH . 'errors.log');
--define('APP_LOCKS_PATH', APP_PATH . 'locks/');
-+define('APP_LOCKS_PATH', '/var/run/eventum/');
++define('APP_LOG_PATH', '/var/log/eventum');
+ define('APP_ERROR_LOG', APP_LOG_PATH . '/errors.log');
+-define('APP_LOCKS_PATH', APP_PATH . '/locks');
++define('APP_LOCKS_PATH', '/var/run/eventum');
- define('APP_BENCHMARK', false);
+ header('Content-Type: text/html; charset=' . APP_CHARSET);
@@ -192,10 +192,6 @@
if (ini_get('file_uploads') != "1") {
// need to create a random private key variable
$private_key = '<?php
$private_key = "' . md5(microtime()) . '";
---- eventum/misc/cli/eventum~ 2007-01-30 20:33:31.435916994 +0200
-+++ eventum/misc/cli/eventum 2007-01-30 20:34:58.717881130 +0200
-@@ -13,3 +13,3 @@
- //
--require_once(dirname(__FILE__) . '/config.inc.php');
-+require_once('/etc/eventum/cli.php');
- require_once(APP_INC_PATH . 'class.command_line.php');
---- eventum/misc/process_mail_queue.php~ 2007-02-15 00:31:11.000000000 +0200
-+++ eventum/misc/process_mail_queue.php 2007-02-15 01:02:15.704386785 +0200
-@@ -30,7 +30,7 @@
-
- ini_set("memory_limit", "1024M");
-
--require_once(dirname(__FILE__) . "/../init.php");
-+require_once(dirname(__FILE__) . "/htdocs/init.php");
- require_once(APP_INC_PATH . "db_access.php");
- require_once(APP_INC_PATH . "class.mail_queue.php");
-
---- eventum/misc/download_emails.php~ 2007-02-15 00:31:11.000000000 +0200
-+++ eventum/misc/download_emails.php 2007-02-15 01:02:56.183553358 +0200
-@@ -30,7 +30,7 @@
-
- ini_set("memory_limit", "1024M");
-
--require_once(dirname(__FILE__) . "/../init.php");
-+require_once(dirname(__FILE__) . "/htdocs/init.php");
- require_once(APP_INC_PATH . "class.support.php");
- require_once(APP_INC_PATH . "class.lock.php");
- require_once(APP_INC_PATH . "class.project.php");
---- eventum/misc/check_reminders.php~ 2007-02-15 01:04:27.107937884 +0200
-+++ eventum/misc/check_reminders.php 2007-02-15 01:10:20.645910516 +0200
-@@ -29,7 +29,7 @@
- // @(#) $Id$
- //
-
--require_once(dirname(__FILE__) . "/../init.php");
-+require_once(dirname(__FILE__) . "/htdocs/init.php");
- require_once(APP_INC_PATH . "db_access.php");
- require_once(APP_INC_PATH . "class.lock.php");
- require_once(APP_INC_PATH . "class.reminder.php");
---- eventum/misc/monitor.php~ 2007-02-15 01:27:45.089473611 +0200
-+++ eventum/misc/monitor.php 2007-02-15 01:28:05.849942411 +0200
-@@ -27,7 +27,7 @@
- //
- // @(#) $Id$
-
--require_once(dirname(__FILE__) . "/../init.php");
-+require_once(dirname(__FILE__) . "/htdocs/init.php");
- require_once(APP_INC_PATH . "class.monitor.php");
-
- // the disk partition in which eventum is stored in
---- eventum/misc/route_drafts.php~ 2007-02-15 01:36:00.780666107 +0200
-+++ eventum/misc/route_drafts.php 2007-02-15 01:36:28.141283847 +0200
-@@ -27,7 +27,7 @@
- //
- // @(#) $Id$
-
--include_once(dirname(__FILE__) . "/../init.php");
-+require_once(dirname(__FILE__) . "/htdocs/init.php");
- require_once(APP_INC_PATH . "db_access.php");
- require_once(APP_INC_PATH . "class.routing.php");
-
---- eventum/misc/route_emails.php~ 2007-02-15 01:37:09.932227380 +0200
-+++ eventum/misc/route_emails.php 2007-02-15 01:37:25.452577786 +0200
-@@ -27,7 +27,7 @@
- //
- // @(#) $Id$
-
--include_once(dirname(__FILE__) . "/../init.php");
-+require_once(dirname(__FILE__) . "/htdocs/init.php");
- require_once(APP_INC_PATH . "db_access.php");
- require_once(APP_INC_PATH . "class.routing.php");
-
---- eventum/misc/route_notes.php~ 2007-02-15 01:38:04.393456957 +0200
-+++ eventum/misc/route_notes.php 2007-02-15 01:38:18.973786135 +0200
-@@ -27,7 +27,7 @@
- //
- // @(#) $Id$
-
--include_once(dirname(__FILE__) . "/../init.php");
-+require_once(dirname(__FILE__) . "/htdocs/init.php");
- require_once(APP_INC_PATH . "db_access.php");
- require_once(APP_INC_PATH . "class.routing.php");
-
+++ /dev/null
-#!/bin/sh
-# $Id$
-#
-
-# qmail exit codes
-HARD=100
-SOFT=111
-OK=0
-
-case "$1" in
-drafts|emails|notes)
- TYPE="$1"
- shift
-;;
-*)
- echo >&2 "Invalid type: $1"
- exit $SOFT
-esac
-
-/usr/share/eventum/route_$TYPE.php "$@" && exit $OK
-rc=$?
-
-# exit codes are for postfix, based on /usr/include/sysexits.h
-#define EX_NOINPUT 66 /* cannot open input */
-#define EX_DATAERR 65 /* data format error */
-#define EX_NOPERM 77 /* permission denied */
-#define EX_CONFIG 78 /* configuration error */
-
-# all known exit codes (from source) are hard errors
-case $rc in
-78|77|65|66)
- rc=$HARD
- ;;
-*)
- rc=$SOFT
- ;;
-esac
-exit $rc
+++ /dev/null
-#!/bin/sh
-
-scriptdir="$1"
-if [ ! -d "$scriptdir" ]; then
- echo >&2 "Missing scriptdir: $scriptdir"
- exit 1
-fi
-
-echo >&2 "Running eventum upgrade scripts in $scriptdir"
-
-upgrade_script() {
- script="$1"; shift
-
- echo -n "Eventum upgrade: $@..."
- if ! php -dmemory_limit=256M $scriptdir/$script; then
- echo >&2 ""
- echo >&2 "Please run manually: php $scriptdir/$script"
- echo >&2 "NOTE: You might need to add CREATE, DROP, ALTER and INDEX privileges to Eventum MySQL user for this to work".
- fi
- echo ""
-}
-
-while read script text; do
- upgrade_script $script "$text"
-done
# - A few other small javascript libraries
#
# Conditional build:
-%bcond_with qmail # build the router-qmail subpackage
%bcond_without order # with experimental order patch
#define snap 20060921
-%define rev r3843
-%define rel 2.13
+%define rev r3862
+%define rel 2.23
#define _rc RC3
%include /usr/lib/rpm/macros.php
#Source0: http://eventum.mysql.org/downloads/eventum-2.0.RC3.tar.gz
#Source0: http://mysql.easynet.be/Downloads/eventum/%{name}-%{version}.tar.gz
# bzr branch lp:eventum eventum && tar -cjf eventum.tar.bz2 --exclude=.bzr --exclude=.bzrignore eventum
-Source0: %{name}-%{rev}.tar.bz2
-# Source0-md5: 394e94ebc88ad96fe9a71666e396113e
+Source0: eventum-%{version}-dev-%{rev}.tar.gz
+# Source0-md5: 4d24ab27c68c632740fe90f6efc584c4
Source1: %{name}-apache.conf
Source2: %{name}-mail-queue.cron
Source3: %{name}-mail-download.cron
Source7: %{name}-irc.php
Source8: %{name}-irc.init
Source9: %{name}-irc.sysconfig
-Source10: %{name}-router-qmail.sh
-Source12: %{name}-upgrade.sh
Source13: %{name}-router-postfix.sh
Source14: %{name}.logrotate
Source15: %{name}-lighttpd.conf
# packaging patches that probably never go upstream
Patch100: %{name}-paths.patch
Patch101: %{name}-cvs-config.patch
-Patch102: %{name}-irc-config.patch
Patch105: %{name}-bot-reconnect.patch
Patch106: %{name}-mem-limits.patch
Patch107: %{name}-gettext.patch
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-%define _noautoreq 'pear(/etc/webapps/.*)' 'pear(%{_appdir}/.*)' 'pear(jpgraph_dir.php)' 'pear(.*Smarty.class.php)'
+%define _noautoreq 'pear(init.php)' 'pear(/etc/webapps/.*)' 'pear(%{_appdir}/.*)' 'pear(jpgraph_dir.php)' 'pear(.*Smarty.class.php)'
%define _libdir %{_prefix}/lib/%{name}
%define _appdir %{_datadir}/%{name}
-%define _smartyplugindir %{_appdir}/include/smarty
%define _smartydir %{php_data_dir}/Smarty
%define _webapps /etc/webapps
%define _webapp %{name}
%description route-drafts
The draft routing feature is used to automatically associate a thread
-of drafts into an Eventum issue. By setting up qmail (or even Postfix)
+of drafts into an Eventum issue. By setting up Postfix
to deliver emails sent to a specific address (usually
draft-<number>@<domain>) to the above script, users are able to send
drafts written in their mail client to be stored in Eventum. These
%description route-drafts -l pl.UTF-8
Przekazywanie szkiców służy do automatycznego wiązania wątku szkiców z
-problemem w Eventum. Ustawiając qmaila (czy nawet Postfiksa), aby
+problemem w Eventum. Ustawiając Postfiksa, aby
dostarczał pocztę wysłaną na podany adres (zwykle
draft-<liczba>@<domena>) do tego skryptu umożliwia się użytkownikom
wysyłanie szkiców napisanych w ich kliencie pocztowym do zapisania w
%description route-emails
The email routing feature is used to automatically associate a thread
-of emails into an Eventum issue. By setting up qmail (or even postfix)
+of emails into an Eventum issue. By setting up Postfix
to deliver emails sent to a specific address (usually
issue-<number>@<domain>) to the above script, users are able to use
their email clients to reply to emails coming from Eventum, and those
%description route-emails -l pl.UTF-8
Funkcjonalność przekazywania poczty służy do automatycznego wiązania
-wątku listów ze sprawą w Eventum. Po ustawieniu qmaila (czy nawet
-postfiksa), aby dostarczał listy wysyłane na pewien adres (zwykle
+wątku listów ze sprawą w Eventum. Po ustawieniu czy nawet
+Postfiksa, aby dostarczał listy wysyłane na pewien adres (zwykle
issue-<numer>@<domena>) na powyższy skrypt, użytkownicy będą mogli
używać klientów pocztowych do odpowiadania na listy przychodzące z
Eventum, a odpowiedzi te będą automatycznie wiązane ze sprawą i
%description route-notes
The note routing feature is used to automatically associate a thread
-of notes into an Eventum issue. By setting up qmail (or even postfix)
+of notes into an Eventum issue. By setting up Postfix
to deliver emails sent to a specific address (usually
note-<number>@<domain>) to the above script, users are able to use
their email clients to reply to internal notes coming from Eventum,
%description route-notes -l pl.UTF-8
Funkcjonalność przekazywania notatek służy do automatycznego wiązania
-wątku notatek ze sprawą w Eventum. Po ustawieniu qmaila (czy nawet
-postfiksa), aby dostarczał listy wysyłane na pewien adres (zwykle
+wątku notatek ze sprawą w Eventum. Po ustawieniu
+Postfiksa, aby dostarczał listy wysyłane na pewien adres (zwykle
note-<numer>@<domena>) na powyższy skrypt, użytkownicy będą mogli
używać klientów pocztowych do odpowiadania na wewnętrzne notatki
pochodzące od Eventu, a odpowiedzi te będą automatycznie wiązane ze
sprawą i rozprowadzane do członków personelu listy ogłoszeniowej.
-%package router-qmail
-Summary: Eventum Mail Routing - qmail
-Summary(pl.UTF-8): Przekazywanie poczty Eventum - qmail
-Group: Applications/Mail
-# loose dep is intentional. qmail subpackage isn't built on PLD
-# builders and there really nothing changes.
-Requires: %{name} >= %{version}-%{release}
-Requires: qmail >= 1.03
-Provides: eventum(router)
-Obsoletes: eventum(router)
-
-%description router-qmail
-This package provides way of routing notes and emails back to Eventum
-via qmail.
-
-%description router-qmail -l pl.UTF-8
-Ten pakiet udostępnia metodę przekazywania notatek i listów do Eventum
-przez qmaila.
-
%package router-postfix
Summary: Eventum Mail Routing - Postfix
Summary(pl.UTF-8): Przekazywanie poczty Eventum - Postfix
</eventum/help.php?topic=scm_integration_installation>.
%prep
-%setup -q %{?snap:-n %{name}-%{snap}}%{?rev:-n %{name}-%{rev}}
-
-rm -r misc/upgrade/*v1.[123]* # too old to support in PLD Linux
-rm -r misc/upgrade/v{1.,2.0,2.1_}* # no longer supported in PLD Linux
-rm misc/upgrade/flush_compiled_templates.php
-rm -r misc/upgrade/{*/,}index.html # not needed in PLD Linux
+%setup -q
-rm -r include/php-gettext
-# sample, not used in eventum
-rm rpc/xmlrpc_client.php
+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
+rm -r upgrade/{*/,}index.html # not needed in PLD Linux
# bug fixes / features
%patch0 -p1
# packaging
%patch100 -p1
%patch101 -p1
-%patch102 -p1
%patch105 -p1
%patch106 -p1
%patch107 -p1
GRANT SELECT, UPDATE, DELETE, INSERT, ALTER, DROP, CREATE, INDEX ON eventum.* TO 'eventum'@'localhost' IDENTIFIED BY 'password';
EOF
-sed -e '1s,#!.*/bin/php -q,#!%{_bindir}/php,' misc/cli/eventum > %{name}-cli
-mv misc/cli/eventumrc_example eventumrc
-sed -i -e '1i#!%{_bindir}/php' misc/*.php
-chmod +x misc/*.php
-
%{__sed} -i -e "
-s,require_once.*init.php.*;,require_once '%{_appdir}/htdocs/init.php';,
s;define('CONFIG_PATH'.*');define('CONFIG_PATH', '%{_webappdir}');
-/define('INSTALL_PATH'/d
-" misc/upgrade/{*/,}*.php
+" upgrade/{*/,}*.php
# remove backups from patching as we use globs to package files to buildroot
find '(' -name '*~' -o -name '*.orig' ')' | xargs -r rm -v
%build
-%{__make} -C misc/localization
+%{__make} -C localization
%install
rm -rf $RPM_BUILD_ROOT
$RPM_BUILD_ROOT/var/lib/%{name}/routed_{emails,drafts,notes} \
$RPM_BUILD_ROOT%{_appdir}/{include,htdocs/misc,upgrade} \
-cp -a *.php css customer images js manage reports rpc setup %{?with_order:ajax} $RPM_BUILD_ROOT%{_appdir}/htdocs
-cp -a misc/*.html $RPM_BUILD_ROOT%{_appdir}/htdocs/misc
-cp -a misc/*.php $RPM_BUILD_ROOT%{_appdir}
-cp -a templates $RPM_BUILD_ROOT%{_appdir}
-cp -a include/{customer,custom_field,jpgraph,workflow} $RPM_BUILD_ROOT%{_appdir}/include
-cp -a include/*.php $RPM_BUILD_ROOT%{_appdir}/include
-touch $RPM_BUILD_ROOT/var/log/%{name}/{cli.log,errors.log,irc_bot.log,login_attempts.log}
-
-cp -a misc/upgrade $RPM_BUILD_ROOT%{_appdir}
-
-cp -a favicon.ico $RPM_BUILD_ROOT%{_appdir}/htdocs/favicon.ico
-install %{SOURCE12} $RPM_BUILD_ROOT%{_appdir}/upgrade/upgrade.sh
+%{__make} install-eventum install-cli install-irc install-scm install-jpgraph install-localization \
+ sysconfdir=%{_webappdir} \
+ DESTDIR=$RPM_BUILD_ROOT
-# cli
-install -d $RPM_BUILD_ROOT%{_appdir}/cli
-cp -a misc/cli/include/class.{misc,command_line}.php $RPM_BUILD_ROOT%{_appdir}/cli
-cp -a misc/cli/config.inc.php $RPM_BUILD_ROOT%{_sysconfdir}/cli.php
-install %{name}-cli $RPM_BUILD_ROOT%{_bindir}/%{name}
-install misc/irc/bot.php $RPM_BUILD_ROOT%{_sbindir}/%{name}-bot
+%{?with_order:cp -a htdocs/ajax $RPM_BUILD_ROOT%{_appdir}/htdocs}
-# scm
-install misc/scm/process_cvs_commits.php $RPM_BUILD_ROOT%{_libdir}/process_cvs_commits
-install misc/scm/process_svn_commits.php $RPM_BUILD_ROOT%{_libdir}/process_svn_commits
-install %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/scm.php
-
-# private key
-echo '<?php
-$private_key = "DEFAULTPRIVATEKEY";' > $RPM_BUILD_ROOT%{_webappdir}/private_key.php
touch $RPM_BUILD_ROOT%{_webappdir}/htpasswd
-
cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_webappdir}/apache.conf
cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_webappdir}/httpd.conf
cp -a %{SOURCE15} $RPM_BUILD_ROOT%{_webappdir}/lighttpd.conf
+
cp -a %{SOURCE2} $RPM_BUILD_ROOT/etc/cron.d/%{name}-mail-queue
cp -a %{SOURCE3} $RPM_BUILD_ROOT/etc/cron.d/%{name}-mail-download
cp -a %{SOURCE4} $RPM_BUILD_ROOT/etc/cron.d/%{name}-reminder
cp -a %{SOURCE5} $RPM_BUILD_ROOT/etc/cron.d/%{name}-monitor
+
cp -a %{SOURCE7} $RPM_BUILD_ROOT%{_webappdir}/irc_config.php
+
cp -a %{SOURCE8} $RPM_BUILD_ROOT/etc/rc.d/init.d/eventum-irc
cp -a %{SOURCE9} $RPM_BUILD_ROOT/etc/sysconfig/eventum-irc
-
-%{__sed} -i -e "/define('APP_VERSION'/ {
- idefine('APP_VERSION', '%{version}%{?snap:-%{snap}}%{?_rc:-%{_rc}}%{?svn:-%{svn}}');
- d
-
-}" $RPM_BUILD_ROOT%{_appdir}/htdocs/init.php
-
-# config
-> $RPM_BUILD_ROOT%{_webappdir}/setup.php
-cat <<'EOF'> $RPM_BUILD_ROOT%{_webappdir}/config.php
-EOF
-
-install -d $RPM_BUILD_ROOT%{_smartyplugindir}
-# These plugins are not in Smarty package (Smarty-2.6.2-3)
-cp -a \
- include/Smarty/plugins/function.{calendar,get_{display_style,innerhtml,textarea_size}}.php \
- include/Smarty/plugins/modifier.highlight_quoted.php \
- $RPM_BUILD_ROOT%{_smartyplugindir}
-
-# qmail router
-%if %{with qmail}
-d=$RPM_BUILD_ROOT/var/lib/%{name}
-echo 'root' > $d/.qmail
-echo 'root' > $d/.qmail-default
-echo '| %{_libdir}/router-qmail drafts' > $d/.qmail-draft-default
-echo '| %{_libdir}/router-qmail emails 1' > $d/.qmail-issue-default
-echo '| %{_libdir}/router-qmail notes' > $d/.qmail-note-default
-install %{SOURCE10} $RPM_BUILD_ROOT%{_libdir}/router-qmail
-%endif
# postfix router
install %{SOURCE13} $RPM_BUILD_ROOT%{_libdir}/router-postfix
install -D %{SOURCE14} $RPM_BUILD_ROOT/etc/logrotate.d/%{name}
-# locale
-cd misc/localization
-for a in */LC_MESSAGES/*.mo; do
- d=${a%/*}
- install -d $RPM_BUILD_ROOT%{_datadir}/locale/$d
- cp -a $a $RPM_BUILD_ROOT%{_datadir}/locale/$d
-done
-cd -
%find_lang %{name}
+# scm
+install %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/scm.php
+
+# old compat
+ln -s %{_sbindir}/eventum-cvs-hook $RPM_BUILD_ROOT%{_libdir}/process_cvs_commits
+ln -s %{_sbindir}/eventum-svn-hook $RPM_BUILD_ROOT%{_libdir}/process_svn_commits
+
+# skip pear for cli
+rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/cli
+cp -a cli/lib/eventum $RPM_BUILD_ROOT%{_datadir}/%{name}/cli
+
%clean
rm -rf $RPM_BUILD_ROOT
%groupremove %{name}
fi
-%post router-qmail
-CF=/etc/qmail/control/virtualdomains
-if ! grep -q ':%{name}\b' $CF 2>/dev/null; then
- FQDN=$(awk -F'"' '/define/ && $2 ~ /APP_HOSTNAME/ {print $4}' %{_webappdir}/config.php 2>/dev/null)
- [ "$FQDN" ] || FQDN=$(hostname -f 2>/dev/null || echo localhost)
- umask 022
- echo "#${FQDN}:%{name}" >> $CF
-
-%banner %{name}-qmail -e <<EOF
-
-Added "#${FQDN}:%{name}" to $CF,
-Please verify that it is correct and restart qmail:
-# service qmail reload
-
-Consult qmail-send(8) for more information on virtualdomains.
-
-EOF
-fi
-
-%preun router-qmail
-if [ "$1" = "0" ]; then
- sed -i -e '/:%{name}\b/d' /etc/qmail/control/virtualdomains
-fi
-
%post setup
chmod 660 %{_webappdir}/{config,private_key}.php
chown root:eventum %{_webappdir}/{config,private_key}.php
%triggerun -- lighttpd
%webapp_unregister lighttpd %{_webapp}
-%triggerpostun -- eventum < 2.1.1-2.13
-%{_appdir}/upgrade/upgrade.sh %{_appdir}/upgrade/v2.1.1_to_v2.2 <<EOF
-db_version.php Add eventum_version table
-EOF
-# automated database update
-%{_appdir}/upgrade/update-database.php || :
-
%files -f %{name}.lang
%defattr(644,root,root,755)
%doc ChangeLog FAQ INSTALL README UPGRADE CONTRIB
-%doc docs/* setup/schema.sql mysql-permissions.sql
+%doc docs/* htdocs/setup/schema.sql mysql-permissions.sql
%attr(751,root,root) %dir %{_webappdir}
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_webappdir}/apache.conf
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_webappdir}/httpd.conf
%dir %attr(750,root,root) /var/log/archive/%{name}
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/%{name}
+%{_appdir}/init.php
%dir %{_appdir}/htdocs
%{_appdir}/htdocs/*.php
%{_appdir}/htdocs/*.ico
%{_appdir}/templates
%dir %{_appdir}/upgrade
-%attr(755,root,root) %{_appdir}/upgrade/upgrade.sh
+%{_appdir}/upgrade/init.php
%attr(755,root,root) %{_appdir}/upgrade/update-database.php
%dir %{_appdir}/upgrade/v*
%attr(755,root,root) %{_appdir}/upgrade/v*/*.php
%{_appdir}/upgrade/patches
-%{_smartyplugindir}
-
-%dir %{_appdir}/include
-%{_appdir}/include/customer
-%{_appdir}/include/custom_field
-%{_appdir}/include/jpgraph
-%{_appdir}/include/workflow
-%{_appdir}/include/autoload.php
-%{_appdir}/include/class.*.php
-%{_appdir}/include/db_access.php
-%exclude %{_appdir}/include/class.monitor.php
+%dir %{_appdir}/lib
+%{_appdir}/lib/eventum
+%{_appdir}/lib/jpgraph
+%exclude %{_appdir}/lib/eventum/class.monitor.php
%dir %attr(730,root,eventum) /var/run/%{name}
%dir %attr(730,root,eventum) /var/cache/%{name}
%attr(751,root,root) %dir %{_sysconfdir}
%dir %{_libdir}
%dir %{_appdir}
-# qmail will ignore user, if it's home directory is not owned
-%attr(750,eventum,eventum) %dir /var/lib/%{name}
+%attr(755,root,root) %dir /var/lib/%{name}
# saved mail copies
%attr(770,root,eventum) %dir /var/lib/%{name}/routed_emails
%attr(770,root,eventum) %dir /var/lib/%{name}/routed_drafts
%files monitor
%defattr(644,root,root,755)
-%{_appdir}/include/class.monitor.php
+%{_appdir}/lib/eventum/class.monitor.php
%attr(755,root,root) %{_appdir}/monitor.php
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/cron.d/%{name}-monitor
%defattr(644,root,root,755)
%attr(755,root,root) %{_appdir}/route_notes.php
-%if %{with qmail}
-%files router-qmail
-%defattr(644,root,root,755)
-%attr(640,root,eventum) %config(noreplace) %verify(not md5 mtime size) /var/lib/%{name}/.qmail*
-%attr(755,root,root) %{_libdir}/router-qmail
-%endif
-
%files router-postfix
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/router-postfix
%defattr(644,root,root,755)
%attr(640,root,eventum) %config(noreplace) %verify(not md5 mtime size) %{_webappdir}/irc_config.php
%attr(640,root,eventum) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/eventum-irc
-%attr(755,root,root) %{_sbindir}/%{name}-bot
+%attr(755,root,root) %{_sbindir}/%{name}-irc-bot
%attr(754,root,root) /etc/rc.d/init.d/%{name}-irc
%files cli
%defattr(644,root,root,755)
-%doc eventumrc
-%config %verify(not md5 mtime size) %{_sysconfdir}/cli.php
+%doc cli/eventumrc
%attr(755,root,root) %{_bindir}/%{name}
%{_appdir}/cli
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/scm.php
%attr(755,root,root) %{_libdir}/process_cvs_commits
%attr(755,root,root) %{_libdir}/process_svn_commits
+%attr(755,root,root) %{_sbindir}/eventum-cvs-hook
+%attr(755,root,root) %{_sbindir}/eventum-svn-hook