packages: cacti-spine/cacti-spine-paths.patch, cacti-spine/cacti-spine.spec...

[glen]

Author: glen                         Date: Mon Jul 12 09:44:18 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 0.8.7g

---- Files affected:
packages/cacti-spine:
   cacti-spine-paths.patch (1.3 -> 1.4) , cacti-spine.spec (1.31 -> 1.32) 

---- Diffs:

================================================================
Index: packages/cacti-spine/cacti-spine-paths.patch
diff -u packages/cacti-spine/cacti-spine-paths.patch:1.3 packages/cacti-spine/cacti-spine-paths.patch:1.4
--- packages/cacti-spine/cacti-spine-paths.patch:1.3	Thu Jul 16 10:48:55 2009
+++ packages/cacti-spine/cacti-spine-paths.patch	Mon Jul 12 11:44:13 2010
@@ -1,7 +1,7 @@
---- 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,21 +136,18 @@
- #define MAX_SIMULTANEOUS_SCRIPTS 20
+--- cacti-spine-0.8.7g/spine.h~	2010-07-12 12:40:01.000000000 +0300
++++ cacti-spine-0.8.7g/spine.h	2010-07-12 12:40:39.663780727 +0300
+@@ -135,22 +135,19 @@
+ #define SPINE_FORK 0
  
  /* locations to search for the config file */
 -#define CONFIG_PATHS 4
@@ -22,6 +22,7 @@
 +#define DEFAULT_DB_USER "mysql"
 +#define DEFAULT_DB_PASS ""
  #define DEFAULT_DB_PORT 3306
+ #define DEFAULT_DB_PREG 0
 -#define DEFAULT_LOGFILE "/var/www/html/cacti/log/cacti.log"
 +#define DEFAULT_LOGFILE "/var/log/cacti/cacti.log"
  #define DEFAULT_TIMEOUT 294000000
@@ -39,20 +40,21 @@
 
  	set.log_destination = LOGDEST_FILE;
  }
---- 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                            |
+--- cacti-spine-0.8.7g/spine.conf.dist~	2010-07-12 12:41:17.000000000 +0300
++++ cacti-spine-0.8.7g/spine.conf.dist	2010-07-12 12:41:55.223780961 +0300
+@@ -32,9 +32,9 @@
+ # | DB_PreG         Set to 1 if you wish to work with older versions of     |
+ # |                 cacti 0.8.7.                                            |
  # +-------------------------------------------------------------------------+
 -DB_Host         localhost
 -DB_Database     cacti
 -DB_User         cactiuser
 -DB_Pass         cactiuser
 -DB_Port         3306
-\ No newline at end of file
+-DB_PreG         0
 +#DB_Host         localhost
 +#DB_Database     cacti
-+#DB_User         mysql
-+#DB_Pass         
++#DB_User         cactiuser
++#DB_Pass         cactiuser
 +#DB_Port         3306
++#DB_PreG         0

================================================================
Index: packages/cacti-spine/cacti-spine.spec
diff -u packages/cacti-spine/cacti-spine.spec:1.31 packages/cacti-spine/cacti-spine.spec:1.32
--- packages/cacti-spine/cacti-spine.spec:1.31	Sun Jun  6 16:48:19 2010
+++ packages/cacti-spine/cacti-spine.spec	Mon Jul 12 11:44:13 2010
@@ -2,16 +2,13 @@
 Summary:	A backend data gatherer for cacti
 Summary(pl.UTF-8):	Backend gromadzący dane dla cacti
 Name:		cacti-spine
-Version:	0.8.7e
-Release:	5
+Version:	0.8.7g
+Release:	1
 License:	GPL
 Group:		Applications
 Source0:	http://www.cacti.net/downloads/spine/%{name}-%{version}.tar.gz
-# Source0-md5:	99e5bde07fc31d1ed8aa23c59de00417
+# Source0-md5:	22c2b1986c880b9c587876c18d5c3f9f
 Patch0:		%{name}-paths.patch
-Patch100:	http://www.cacti.net/downloads/spine/patches/snmp_v3_fix.patch
-Patch101:	http://www.cacti.net/downloads/spine/patches/mysql_client_reconnect.patch
-Patch102:	http://www.cacti.net/downloads/spine/patches/ping_reliability.patch
 URL:		http://www.cacti.net/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -42,9 +39,6 @@
 
 %prep
 %setup -q
-%patch100 -p1
-%patch101 -p1
-%patch102 -p1
 %patch0 -p1
 
 %build
@@ -64,9 +58,8 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-install -d $RPM_BUILD_ROOT%{_sysconfdir}
-cp -a spine.conf $RPM_BUILD_ROOT%{_sysconfdir}
 mv $RPM_BUILD_ROOT%{_sbindir}/{spine,cacti-poller-spine}
+mv $RPM_BUILD_ROOT%{_sysconfdir}/spine.conf{.dist,}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -74,8 +67,8 @@
 %files
 %defattr(644,root,root,755)
 %doc README
-%attr(755,root,root) %{_sbindir}/cacti-poller-spine
 %attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/spine.conf
+%attr(755,root,root) %{_sbindir}/cacti-poller-spine
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -83,6 +76,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.32  2010/07/12 09:44:13  glen
+- up to 0.8.7g
+
 Revision 1.31  2010/06/06 14:48:19  arekm
 - release 5
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cacti-spine/cacti-spine-paths.patch?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cacti-spine/cacti-spine.spec?r1=1.31&r2=1.32&f=u