- webroot (needed for spine) is already config[base_path]

Changed files:
    cacti-webroot.patch -> 1.1
    cacti.spec -> 1.86

diff --git a/cacti-webroot.patch b/cacti-webroot.patch
new file mode 100644 (file)
index 0000000..ec42410
--- /dev/null
+++ b/cacti-webroot.patch
@@ -0,0 +1,13 @@
+--- /poller.php~       2008-10-05 16:54:15.000000000 +0300
++++ /poller.php        2008-10-05 16:57:05.946911539 +0300
+@@ -181,7 +181,9 @@
+       $last_host           = 0;
+ 
+       /* update web paths for the poller */
+-      db_execute("replace into settings (name,value) values ('path_webroot','" . addslashes(($config["cacti_server_os"] == "win32") ? strtr(strtolower(substr(dirname(__FILE__), 0, 1)) . substr(dirname(__FILE__), 1),"\\", "/") : dirname(__FILE__)) . "')");
++//    $path_webroot = ($config["cacti_server_os"] == "win32") ? strtr(strtolower(substr(dirname(__FILE__), 0, 1)) . substr(dirname(__FILE__), 1),"\\", "/") : dirname(__FILE__);
++      $path_webroot = $config['base_path'];
++      db_execute("replace into settings (name,value) values ('path_webroot','" .  addslashes($path_webroot) . "')");
+ 
+       /* obtain some defaults from the database */
+       $poller      = read_config_option("poller_type");

diff --git a/cacti.spec b/cacti.spec
index 7c319c48cee8ca21dcc97f39f7a618f94826120c..d102e5f0ef4fd0247b3af6b28bd7f604bf4f7e4f 100644 (file)
--- a/cacti.spec
+++ b/cacti.spec
@@ -20,6 +20,7 @@ Patch3:               http://www.cacti.net/downloads/patches/0.8.7b/reset_each_patch.patch
 Patch4:                %{name}-config.patch
 Patch5:                %{name}-adodb.patch
 Patch6:                %{name}-ioerror.patch
+Patch7:                %{name}-webroot.patch
 URL:           http://www.cacti.net/
 BuildRequires: rpm-perlprov
 BuildRequires: sed >= 4.0
@@ -99,6 +100,7 @@ HTML Documentation for Cacti.
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 mkdir -p sql
 mv *.sql sql