up to 3.0.3-20-g10ba91f; package config symlink to have less patching

[packages/eventum.git] / eventum-paths.patch

diff --git a/eventum-paths.patch b/eventum-paths.patch
index 59693b49b6f8ea86600bf7ddb130b081910e010d..5fc525b610b0e496637943a03dedfd1dd88e4a02 100644 (file)
--- a/eventum-paths.patch
+++ b/eventum-paths.patch
@@ -1,23 +1,5 @@
 --- eventum-3.0.2-28-g0d12f69.old/init.php     2015-09-14 13:20:59.450996838 +0300
 +++ eventum-3.0.2-28-g0d12f69/init.php 2015-09-11 23:17:34.000000000 +0300
-@@ -28,7 +28,7 @@
- // | Authors: Elan Ruusamäe <glen@delfi.ee>                               |
- // +----------------------------------------------------------------------+
- 
--if (!file_exists(dirname(__FILE__) . '/config/config.php') || !filesize(dirname(__FILE__) . '/config/config.php')) {
-+if (!file_exists('/etc/webapps/eventum/config.php') || !filesize('/etc/webapps/eventum/config.php')) {
-     Header('Location: setup/');
-     exit(0);
- }
-@@ -45,7 +45,7 @@
- // define base path
- define('APP_PATH', realpath(dirname(__FILE__)));
- if (!defined('APP_CONFIG_PATH')) {
--    define('APP_CONFIG_PATH', APP_PATH . '/config');
-+    define('APP_CONFIG_PATH', '/etc/webapps/eventum');
- }
- 
- // include local site config. may override any default
 @@ -78,7 +78,7 @@
  }
  
@@ -68,13 +50,13 @@
      $error = checkPermissions(APP_SETUP_FILE, "File '" . APP_SETUP_FILE. "'");
      if (!empty($error)) {
          $errors[] = $error;
---- eventum-2.2/irc/eventum-irc-bot.php~       2009-07-23 14:03:41.422211655 +0300
-+++ eventum-2.2/irc/eventum-irc-bot.php        2009-07-23 13:54:22.000000000 +0300
-@@ -32,7 +32,7 @@
+--- eventum-3.0.3-13-gfefa325/irc/eventum-irc-bot.php~ 2015-10-13 20:00:48.000000000 +0300
++++ eventum-3.0.3-13-gfefa325/irc/eventum-irc-bot.php  2015-10-13 23:33:33.408818382 +0300
+@@ -31,7 +31,7 @@
  
  ini_set('memory_limit', '1024M');
  
--require_once dirname(__FILE__) . '/../init.php';
+-require_once __DIR__ . '/../init.php';
 +require_once '/usr/share/eventum/init.php';
  
  if (!file_exists(APP_CONFIG_PATH . '/irc_config.php')) {
@@ -103,48 +85,14 @@
          'check_permission' => true,
          'permission'       => 660,
          'check_filesize'   => true,
---- eventum-2.3.3/config/sphinx.conf.php~      2012-06-27 14:59:39.000000000 +0300
-+++ eventum-2.3.3/config/sphinx.conf.php       2012-06-27 15:04:52.928810689 +0300
+--- eventum-3.0.3-13-gfefa325/config/sphinx.conf.php~  2015-10-13 20:00:48.000000000 +0300
++++ eventum-3.0.3-13-gfefa325/config/sphinx.conf.php   2015-10-13 23:34:19.668134549 +0300
 @@ -26,7 +26,7 @@
  // | Authors: Bryan Alsdorf <bryan@mysql.com>                             |
  // | Authors: Elan Ruusamäe <glen@delfi.ee>                               |
  // +----------------------------------------------------------------------+
--require_once dirname(__FILE__) . "/../init.php";
+-require_once __DIR__ . "/../init.php";
 +require_once '/usr/share/eventum/init.php';
  
  if (!defined('SPHINX_LOG_PATH')) {
      define('SPHINX_LOG_PATH', '/var/log/sphinx/');
---- eventum-3.0.0-285-g72865b8/autoload.php~   2015-04-20 23:14:34.904789824 +0300
-+++ eventum-3.0.0-285-g72865b8/autoload.php    2015-04-20 23:22:44.240566443 +0300
-@@ -54,11 +54,11 @@
-  */
- 
- if (!defined('APP_PEAR_PATH')) {
--    define('APP_PEAR_PATH', '');
-+    define('APP_PEAR_PATH', '/usr/share/pear');
- }
- 
- if (!defined('APP_PHP_PATH')) {
--    define('APP_PHP_PATH', '');
-+    define('APP_PHP_PATH', '/usr/share/php');
- }
- 
- if (!defined('APP_FONTS_PATH')) {
-@@ -66,7 +66,7 @@
- }
- 
- if (!defined('APP_SPHINXAPI_PATH')) {
--    define('APP_SPHINXAPI_PATH', '');
-+    define('APP_SPHINXAPI_PATH', APP_PHP_PATH);
- }
- 
- if (!defined('APP_PHP_GETTEXT_PATH')) {
-@@ -74,7 +74,7 @@
- }
- 
- if (!defined('APP_SMARTY_PATH')) {
--    define('APP_SMARTY_PATH', '');
-+    define('APP_SMARTY_PATH', APP_PHP_PATH . '/Smarty3');
- }
- 
- // add PEAR to the include path, required by PEAR classes