rpms/cacti/EL-6 cacti.spec,1.31,1.32 sources,1.9,1.10

[Mike McGrath]

Author: mmcgrath

Update of /cvs/pkgs/rpms/cacti/EL-6
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv3914/EL-6

Modified Files:
	cacti.spec sources 
Log Message:
upstream released new version


Index: cacti.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cacti/EL-6/cacti.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- cacti.spec	23 Apr 2010 13:54:05 -0000	1.31
+++ cacti.spec	12 Jul 2010 15:32:14 -0000	1.32
@@ -1,6 +1,6 @@
 Name: cacti
-Version: 0.8.7e
-Release: 4%{?dist}
+Version: 0.8.7g
+Release: 1%{?dist}
 Summary: An rrd based graphing tool
 
 Group: Applications/System
@@ -11,11 +11,6 @@ Source0: http://www.cacti.net/downloads/
 Source1: cacti-httpd.conf
 Source2: cacti.logrotate
 Source3: cacti.README.Fedora
-Patch0: cli_add_graph.patch
-Patch1: snmp_invalid_response.patch
-Patch2: template_duplication.patch
-Patch3: cross_site_fix.patch
-Patch4: sql_injection_template_export.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -35,11 +30,6 @@ used to creating traffic graphs with MRT
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
 
 echo "#*/5 * * * *	cacti	%{_bindir}/php %{_datadir}/%{name}/poller.php > /dev/null 2>&1" >cacti.cron
 
@@ -115,6 +105,13 @@ fi
 %attr(0644,root,root) %{_localstatedir}/lib/%{name}/lib
 
 %changelog
+* Mon Jul 12 2010 Mike McGrath <mmcgrath at redhat.com> 0.8.7g-1
+- Upstream released new version
+
+* Mon May 24 2010 Mike McGrath <mmcgrath at redhat.com> - 0.8.7f-1
+- Upstream released new version
+- Contains security updates #595289
+
 * Fri Apr 23 2010 Mike McGrath <mmcgrath at redhat.com> - 0.8.7e-4
 - Pulling in patches from upstream
 - SQL injection fix


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cacti/EL-6/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	17 Aug 2009 02:00:42 -0000	1.9
+++ sources	12 Jul 2010 15:32:14 -0000	1.10
@@ -1 +1 @@
-7563a58a57d2c6cc0da28cc341a30969  cacti-0.8.7e.tar.gz
+268421cb1a58d3444f7ecbddb4c4b016  cacti-0.8.7g.tar.gz