From: Elan Ruusamäe <glen@pld-linux.org>
Date: Tue, 25 Jan 2005 22:27:21 +0000 (+0000)
Subject: - patch to use system PEAR packages
X-Git-Tag: deadbranch-1.51.2~22
X-Git-Url: http://git.pld-linux.org/?a=commitdiff_plain;h=93aec526f51e681afb8f80c10666b950c0811142;p=packages%2Feventum.git

- patch to use system PEAR packages

Changed files:
    eventum-PEAR.patch -> 1.1
---

diff --git a/eventum-PEAR.patch b/eventum-PEAR.patch
new file mode 100644
index 0000000..268b370
--- /dev/null
+++ b/eventum-PEAR.patch
@@ -0,0 +1,84 @@
+--- eventum-1.4/setup/config.inc.php~	2005-01-25 23:50:53.000000000 +0200
++++ eventum-1.4/setup/config.inc.php	2005-01-25 23:51:23.000000000 +0200
+@@ -54,9 +54,9 @@
+ }
+ @define("APP_PATH", $app_path);
+ @define("APP_INC_PATH", APP_PATH . "include/");
+-@define("APP_PEAR_PATH", APP_INC_PATH . "pear/");
++@define("APP_PEAR_PATH", "/usr/share/pear/");
+ @define("APP_TPL_PATH", APP_PATH . "templates/");
+-@define("APP_SMARTY_PATH", APP_INC_PATH . "Smarty/");
++@define("APP_SMARTY_PATH", APP_PEAR_PATH . "Smarty/");
+ @define("APP_JPGRAPH_PATH", APP_INC_PATH . "jpgraph/");
+ @define("APP_LOG_PATH", "/var/log/eventum/");
+ @define("APP_LOCKS_PATH", "/var/run/eventum/");
+--- eventum-1.4/setup/index.php~	2005-01-25 23:52:31.000000000 +0200
++++ eventum-1.4/setup/index.php	2005-01-25 23:52:33.000000000 +0200
+@@ -199,7 +199,7 @@
+ }
+ 
+ ini_set("include_path", '.');
+-include_once("../include/Smarty/Smarty.class.php");
++include_once("/usr/share/pear/Smarty/Smarty.class.php");
+ 
+ $tpl = new Smarty();
+ $tpl->template_dir = '../templates/en';
+--- eventum-1.4/misc/cli/config.inc.php~	2005-01-26 00:24:10.000000000 +0200
++++ eventum-1.4/misc/cli/config.inc.php	2005-01-26 00:24:12.000000000 +0200
+@@ -47,7 +47,7 @@
+ // definitions of path related variables
+ @define("APP_PATH", '/usr/share/eventum/misc/cli/');
+ @define("APP_INC_PATH", APP_PATH . "include/");
+-@define("APP_PEAR_PATH", APP_INC_PATH . "pear/");
++@define("APP_PEAR_PATH", "/usr/share/pear/");
+ ini_set("include_path", ".:" . APP_PEAR_PATH);
+ 
+ @define("APP_BENCHMARK", false);
+--- ./misc/cli/eventum~	2005-01-24 17:49:25.000000000 +0200
++++ ./misc/cli/eventum	2005-01-25 15:48:56.000000000 +0200
+@@ -13,7 +13,7 @@
+ //
+ include_once("/etc/eventum/cli.php");
+ include_once(APP_INC_PATH . "class.command_line.php");
+-include_once(APP_PEAR_PATH . "XML_RPC/RPC.php");
++include_once(APP_PEAR_PATH . "XML/RPC.php");
+ 
+ list($user_email, $user_password, $url, $port, $relative_url) = Command_Line::getEnvironmentSettings();
+ if (empty($port)) {
+--- ./misc/cli/include/class.command_line.php	2005-01-05 01:06:03.000000000 +0200
++++ ./misc/cli/include/class.command_line.php	2005-01-25 15:48:56.000000000 +0200
+@@ -29,7 +29,7 @@
+ //
+ 
+ include_once(APP_INC_PATH . "class.misc.php");
+-include_once(APP_PEAR_PATH . "XML_RPC/RPC.php");
++include_once(APP_PEAR_PATH . "XML/RPC.php");
+ 
+ $_displayed_confirmation = false;
+ 
+--- ./rpc/xmlrpc.php~	2005-01-05 01:06:19.000000000 +0200
++++ ./rpc/xmlrpc.php	2005-01-25 16:35:14.000000000 +0200
+@@ -41,7 +41,7 @@
+ include_once(APP_INC_PATH . "class.template.php");
+ include_once(APP_INC_PATH . "class.customer.php");
+ error_reporting(0);
+-include_once(APP_PEAR_PATH . "XML_RPC/Server.php");
++include_once(APP_PEAR_PATH . "XML/RPC/Server.php");
+ 
+ function authenticate($email, $password)
+ {
+--- ./include/class.notification.php~	2005-01-05 01:06:19.000000000 +0200
++++ ./include/class.notification.php	2005-01-25 16:41:23.000000000 +0200
+@@ -613,9 +613,9 @@
+         }
+         if ($old["iss_description"] != $new["description"]) {
+             // need real diff engine here
+-            include_once 'Text_Diff/Diff.php';
+-            include_once 'Text_Diff/Diff/Renderer.php';
+-            include_once 'Text_Diff/Diff/Renderer/unified.php';
++            include_once 'Text/Diff.php';
++            include_once 'Text/Diff/Renderer.php';
++            include_once 'Text/Diff/Renderer/unified.php';
+             $old['iss_description'] = explode("\n", $old['iss_description']);
+             $new['description'] = explode("\n", $new['description']);
+             $diff = &new Text_Diff($old["iss_description"], $new["description"]);