- up to 0.8.7g

Changed files:
    cacti-spine-paths.patch -> 1.4
    cacti-spine.spec -> 1.32

diff --git a/cacti-spine-paths.patch b/cacti-spine-paths.patch
index 1cf2ca3a6b0d1f4f51fbb5c78d64b358d3ca45c1..c1ea4d8dff45fedb6bbb0a63311449d1ea5d081d 100644 (file)
--- a/cacti-spine-paths.patch
+++ b/cacti-spine-paths.patch
@@ -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

diff --git a/cacti-spine.spec b/cacti-spine.spec
index b369740c243a610bdf4223cb542fd30c4e1534b8..fcc59cd74658d4172ee82d71ea829355d60712dd 100644 (file)
--- a/cacti-spine.spec
+++ b/cacti-spine.spec
@@ -1,16 +1,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
@@ -41,9 +38,6 @@ procesorem cmd.php.
 
 %prep
 %setup -q
-%patch100 -p1
-%patch101 -p1
-%patch102 -p1
 %patch0 -p1
 
 %build
@@ -63,9 +57,8 @@ rm -rf $RPM_BUILD_ROOT
 %{__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
@@ -73,5 +66,5 @@ rm -rf $RPM_BUILD_ROOT
 %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