From 9d56b56ea61978effe8f414e3f8c743f209ec14a Mon Sep 17 00:00:00 2001
From: =?utf8?q?Elan=20Ruusam=C3=A4e?= <glen@pld-linux.org>
Date: Thu, 16 Jul 2009 08:48:55 +0000
Subject: [PATCH] =?utf8?q?-=20up=20to=200.8.7e=20by=20Eero=20H=C3=A4nninen?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Changed files:
    cacti-spine-paths.patch -> 1.3
    cacti-spine.spec -> 1.27
---
 cacti-spine-paths.patch | 16 +++++++++-------
 cacti-spine.spec        |  5 ++---
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/cacti-spine-paths.patch b/cacti-spine-paths.patch
index dba3bcb..1cf2ca3 100644
--- a/cacti-spine-paths.patch
+++ b/cacti-spine-paths.patch
@@ -1,13 +1,14 @@
 --- cacti-spine-0.8.7a/spine.h~	2007-11-26 05:40:21.000000000 +0200
 +++ cacti-spine-0.8.7a/spine.h	2008-10-05 05:33:49.545548298 +0300
-@@ -136,20 +136,18 @@
+@@ -136,21 +136,18 @@
  #define MAX_SIMULTANEOUS_SCRIPTS 20
  
  /* locations to search for the config file */
--#define CONFIG_PATHS 3
+-#define CONFIG_PATHS 4
 -#define CONFIG_PATH_1 ""
 -#define CONFIG_PATH_2 "/etc/"
--#define CONFIG_PATH_3 "../etc/"
+-#define CONFIG_PATH_3 "/etc/cacti/"
+-#define CONFIG_PATH_4 "../etc/"
 +#define CONFIG_PATHS 1
 +#define CONFIG_PATH_1 "/etc/webapps/cacti/"
  
@@ -28,17 +29,18 @@
  /* threads constants */
 --- cacti-spine-0.8.7a/util.c~	2007-11-26 05:40:21.000000000 +0200
 +++ cacti-spine-0.8.7a/util.c	2008-10-05 05:35:03.349764684 +0300
-@@ -462,8 +462,6 @@
+@@ -462,9 +462,6 @@
  	STRNCOPY(set.dbpass, DEFAULT_DB_PASS);
  
  	STRNCOPY(config_paths[0], CONFIG_PATH_1);
 -	STRNCOPY(config_paths[1], CONFIG_PATH_2);
 -	STRNCOPY(config_paths[2], CONFIG_PATH_3);
- 
+-	STRNCOPY(config_paths[3], CONFIG_PATH_4);
+
  	set.log_destination = LOGDEST_FILE;
  }
---- cacti-spine-0.8.7a/spine.conf.dist~	2007-11-26 05:40:21.000000000 +0200
-+++ cacti-spine-0.8.7a/spine.conf.dist	2008-10-05 05:41:07.495832134 +0300
+--- cacti-spine-0.8.7a/spine.conf~	2007-11-26 05:40:21.000000000 +0200
++++ cacti-spine-0.8.7a/spine.conf	2008-10-05 05:41:07.495832134 +0300
 @@ -28,8 +28,8 @@
  # | DB_User      The user to access the database, typically 'cactiuser'     |
  # | DB_Pass      The password for the Cacti user                            |
diff --git a/cacti-spine.spec b/cacti-spine.spec
index 8bd768a..dd5cd65 100644
--- a/cacti-spine.spec
+++ b/cacti-spine.spec
@@ -1,12 +1,12 @@
 Summary:	A backend data gatherer for cacti
 Summary(pl.UTF-8):	Backend gromadzący dane dla cacti
 Name:		cacti-spine
-Version:	0.8.7c
+Version:	0.8.7e
 Release:	1
 License:	GPL
 Group:		Applications
 Source0:	http://www.cacti.net/downloads/spine/%{name}-%{version}.tar.gz
-# Source0-md5:	8e924e83735d411c2798cc646d67d21e
+# Source0-md5:	99e5bde07fc31d1ed8aa23c59de00417
 Patch0:		%{name}-paths.patch
 URL:		http://www.cacti.net/
 BuildRequires:	autoconf
@@ -58,7 +58,6 @@ install -d $RPM_BUILD_ROOT%{_sysconfdir}
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-mv spine.conf.dist spine.conf
 install spine.conf $RPM_BUILD_ROOT%{_sysconfdir}
 mv $RPM_BUILD_ROOT%{_sbindir}/{spine,cacti-poller-spine}
 
-- 
2.43.0