rpms/cacti/devel cacti.spec,1.29,1.30

[Mike McGrath]

Author: mmcgrath

Update of /cvs/pkgs/rpms/cacti/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9854

Modified Files:
	cacti.spec 
Log Message:
Applying upstream patches


Index: cacti.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cacti/devel/cacti.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- cacti.spec	17 Aug 2009 02:00:41 -0000	1.29
+++ cacti.spec	1 Dec 2009 14:59:05 -0000	1.30
@@ -1,6 +1,6 @@
 Name: cacti
 Version: 0.8.7e
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: An rrd based graphing tool
 
 Group: Applications/System
@@ -11,6 +11,11 @@ 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.patchcross_site_fix.patch
+
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -30,6 +35,10 @@ used to creating traffic graphs with MRT
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 echo "#*/5 * * * *	cacti	%{_bindir}/php %{_datadir}/%{name}/poller.php > /dev/null 2>&1" >cacti.cron
 
@@ -105,6 +114,11 @@ fi
 %attr(0644,root,root) %{_localstatedir}/lib/%{name}/lib
 
 %changelog
+* Tue Dec  1 2009 Mike McGrath <mmcgrath at redhat.com> - 0.8.7e-2
+- Pulling in some official patches
+- #541279
+- #541962
+
 * Sun Aug 16 2009 Mike McGrath <mmcgrath at redhat.com> - 0.8.7e-1
 - Upstream released new version