From 031b37a191e18d0886b419b6df5b4e4a9ece193c Mon Sep 17 00:00:00 2001
From: Mike McGrath <mmcgrath@fedoraproject.org>
Date: Sat, 5 May 2007 20:46:41 +0000
Subject: [PATCH] Upstream released a new version

---
 .cvsignore |  3 +--
 cacti.spec | 15 +++++----------
 sources    |  3 +--
 3 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index f086e72..83c4787 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1 @@
-cacti-0.8.6h.tar.gz
-cacti-0.8.6i.tar.gz
+cacti-0.8.6j.tar.gz
diff --git a/cacti.spec b/cacti.spec
index 3377bc8..a63b842 100644
--- a/cacti.spec
+++ b/cacti.spec
@@ -1,6 +1,6 @@
 Name: cacti
-Version: 0.8.6i
-Release: 5%{?dist}
+Version: 0.8.6j
+Release: 1%{?dist}
 Summary: An rrd based graphing tool
 
 Group: Applications/System
@@ -12,10 +12,6 @@ Source2: cacti.logrotate
 Source3: cacti.README.Fedora
 
 Patch1: cacti-0.8.6h-dbcfg.patch
-Patch2: http://www.cacti.net/downloads/patches/0.8.6i/import_template_argument_space_removal.patch
-Patch3: http://www.cacti.net/downloads/patches/0.8.6i/dec06-vulnerability-scripts-0.8.6i.patch
-Patch4: http://www.cacti.net/downloads/patches/0.8.6i/dec06-vulnerability-poller-0.8.6i.patch
-Patch5: http://www.cacti.net/downloads/patches/0.8.6i/poller_output_remainder.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -36,10 +32,6 @@ used to creating traffic graphs with MRTG.
 %prep
 %setup -q
 %patch1 -p0
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
 
 echo "#*/5 * * * *	cacti	%{_bindir}/php %{_datadir}/%{name}/poller.php > /dev/null 2>&1" >cacti.cron
 
@@ -111,6 +103,9 @@ fi
 %attr(0644,root,root) %{_localstatedir}/lib/%{name}/lib
 
 %changelog
+* Sat May 05 2007 Mike McGrath <mmcgrath@redhat.com> - 0.8.6j-5
+- Upstream released new version
+
 * Fri Jan 12 2007 Mike McGrath <imlinux@gmail.com> - 0.8.6i-5
 - Added 4 upstream patches
 - Fix for BZ 222410
diff --git a/sources b/sources
index 2d9aed6..2979952 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-5f6100b525b5b29e81f43cc7c55f4000  cacti-0.8.6h.tar.gz
-341b5828d95db91f81f5fbba65411d63  cacti-0.8.6i.tar.gz
+29436be46b289d13dfce48e7618129e2  cacti-0.8.6j.tar.gz