up to 0.8.8

Plugin Architecture is now part of Cacti

diff --git a/cacti-config.patch b/cacti-config.patch
index c1e56a23126d523d2a11703653504f4306cd59fb..d9a821c1302e614cd2b53b65e65396d9bedd7137 100644 (file)
--- a/cacti-config.patch
+++ b/cacti-config.patch
@@ -72,14 +72,14 @@
                }
  
                /* echo the data to the log (append) */
---- cacti-0.8.7b/utilities.php~        2008-10-05 04:29:33.128070807 +0300
-+++ cacti-0.8.7b/utilities.php 2008-10-05 04:43:30.176737491 +0300
-@@ -693,12 +693,12 @@
+--- cacti-0.8.8/utilities.php~ 2012-10-29 22:14:05.000000000 +0200
++++ cacti-0.8.8/utilities.php  2012-10-29 22:15:05.781005237 +0200
+@@ -798,12 +798,12 @@
  }
  
  function utilities_view_logfile() {
--      global $colors, $log_tail_lines, $page_refresh_interval;
-+      global $config, $colors, $log_tail_lines, $page_refresh_interval;
+-      global $colors, $log_tail_lines, $page_refresh_interval, $refresh;
++      global $colors, $log_tail_lines, $page_refresh_interval, $config;
  
        $logfile = read_config_option("path_cactilog");
  

diff --git a/cacti.spec b/cacti.spec
index 02f3bc346ac038fbf76c68d9711ad821d0b55220..b120920490ad1c69b28a2115dc00bbdef8b27d13 100644 (file)
--- a/cacti.spec
+++ b/cacti.spec
@@ -2,12 +2,12 @@
 Summary:       Cacti is a PHP frontend for rrdtool
 Summary(pl.UTF-8):     Cacti - frontend w PHP do rrdtoola
 Name:          cacti
-Version:       0.8.7i
-Release:       9
+Version:       0.8.8
+Release:       0.1
 License:       GPL v2
 Group:         Applications/WWW
-Source0:       http://www.cacti.net/downloads/%{name}-%{version}-PIA-%{pia_ver}.tar.gz
-# Source0-md5: 669770a7837986971a279104dbb50b75
+Source0:       http://www.cacti.net/downloads/%{name}-%{version}.tar.gz
+# Source0-md5: 574c4266524c084d1ea5a5443beb6dde
 Source2:       %{name}.crontab
 Source3:       %{name}-apache.conf
 Source4:       %{name}-lighttpd.conf
@@ -23,8 +23,6 @@ Patch6:               %{name}-log-verbosity.patch
 Patch7:                %{name}-ss_disk-array-indices.patch
 Patch8:                host_name-url.patch
 # http://www.cacti.net/download_patches.php
-Patch10:       http://www.cacti.net/downloads/patches/%{version}/settings_checkbox.patch
-# Patch10-md5: 930e6c18b692fb94a19ddbd95a529a8b
 URL:           http://www.cacti.net/
 BuildRequires: sed >= 4.0
 Requires(postun):      /usr/sbin/userdel
@@ -113,9 +111,8 @@ HTML Documentation for Cacti.
 Dokumentacja do Cacti w formacie HTML.
 
 %prep
-%setup -q -n %{name}-%{version}-PIA-%{pia_ver}
+%setup -q
 # official patches
-%patch10 -p1
 
 %patch0 -p1
 %patch1 -p1