packages: cacti/cacti.spec, cacti/cli-relpath.patch (NEW) - make sure cli p...

[glen]

Author: glen                         Date: Wed Apr 14 15:13:23 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- make sure cli programs work from any current dir; rel 8

---- Files affected:
packages/cacti:
   cacti.spec (1.117 -> 1.118) , cli-relpath.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/cacti/cacti.spec
diff -u packages/cacti/cacti.spec:1.117 packages/cacti/cacti.spec:1.118
--- packages/cacti/cacti.spec:1.117	Tue Apr 13 22:25:25 2010
+++ packages/cacti/cacti.spec	Wed Apr 14 17:13:18 2010
@@ -4,7 +4,7 @@
 Summary(pl.UTF-8):	Cacti - frontend w PHP do rrdtoola
 Name:		cacti
 Version:	0.8.7e
-Release:	7
+Release:	8
 License:	GPL
 Group:		Applications/WWW
 Source0:	http://www.cacti.net/downloads/%{name}-%{version}.tar.gz
@@ -32,6 +32,7 @@
 Patch7:		%{name}-ss_disk-array-indices.patch
 Patch8:		%{name}-rrdresourcecheck.patch
 Patch9:		host_name-url.patch
+Patch10:	cli-relpath.patch
 URL:		http://www.cacti.net/
 BuildRequires:	rpm-perlprov
 BuildRequires:	sed >= 4.0
@@ -132,6 +133,7 @@
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
+%patch10 -p1
 
 mkdir -p sql
 mv *.sql sql
@@ -264,6 +266,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.118  2010/04/14 15:13:18  glen
+- make sure cli programs work from any current dir; rel 8
+
 Revision 1.117  2010/04/13 20:25:25  glen
 - release 7
 

================================================================
Index: packages/cacti/cli-relpath.patch
diff -u /dev/null packages/cacti/cli-relpath.patch:1.1
--- /dev/null	Wed Apr 14 17:13:23 2010
+++ packages/cacti/cli-relpath.patch	Wed Apr 14 17:13:18 2010
@@ -0,0 +1,13 @@
+--- cacti-0.8.7e/cli/import_template.php	2010-04-14 18:11:37.575631837 +0300
++++ cacti-0.8.7e/cli/import_template.php	2010-04-14 18:07:35.956754241 +0300
+@@ -31,8 +31,8 @@
+ /* We are not talking to the browser */
+ $no_http_headers = true;
+ 
+-include(dirname(__FILE__)."/../include/global.php");
+-include_once("../lib/import.php");
++require(dirname(__FILE__)."/../include/global.php");
++require_once(dirname(__FILE__)."/../lib/import.php");
+ 
+ /* process calling arguments */
+ $parms = $_SERVER["argv"];
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cacti/cacti.spec?r1=1.117&r2=1.118&f=u