packages: cacti-template-nagiostats/cacti-template-nagiostats.spec - put na...

[glen]

Author: glen                         Date: Mon Dec 13 22:00:22 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- put nagios addon to nagios-cgi-nagiostats pkg

---- Files affected:
packages/cacti-template-nagiostats:
   cacti-template-nagiostats.spec (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: packages/cacti-template-nagiostats/cacti-template-nagiostats.spec
diff -u packages/cacti-template-nagiostats/cacti-template-nagiostats.spec:1.5 packages/cacti-template-nagiostats/cacti-template-nagiostats.spec:1.6
--- packages/cacti-template-nagiostats/cacti-template-nagiostats.spec:1.5	Mon Dec 13 13:27:26 2010
+++ packages/cacti-template-nagiostats/cacti-template-nagiostats.spec	Mon Dec 13 23:00:17 2010
@@ -1,11 +1,13 @@
 # $Revision$, $Date$
 # TODO
-# - package for nagios cgi only to support remote installs
+# - Data Sources (data_sources.php) get duplicated if you use host template,
+#   this is limitation of cacti, but you can manually join the DS with graphs
+#   and delete overkill.
 %define		template	nagiostats
 Summary:	Nagios Statistics - Cacti scripts and templates
 Name:		cacti-template-%{template}
 Version:	0.1
-Release:	0.7
+Release:	0.13
 License:	GPL v2
 Group:		Applications/WWW
 Source0:	http://forums.cacti.net/download/file.php?id=18185#/nacti.tar.gz
@@ -15,11 +17,11 @@
 Patch0:		pld.patch
 Patch1:		cgi-rfc.patch
 URL:		http://forums.cacti.net/about33806.html
-BuildRequires:	rpmbuild(macros) >= 1.554
+BuildRequires:	rpmbuild(macros) >= 1.595
 BuildRequires:	sed >= 4.0
 Requires:	cacti >= 0.8.7e-8
-# nagios-cacti-nagiostats
-Requires:	nagios-cgi
+Requires:	wget
+Suggests:	nagios-cgi-nagiostats
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -32,6 +34,14 @@
 %description
 Template for Cacti - Nagios statistics.
 
+%package -n nagios-cgi-nagiostats
+Summary:	CGI webinterface for Nagiostats
+Group:		Applications/WWW
+Requires:	nagios-cgi
+
+%description -n nagios-cgi-nagiostats
+CGI webinterface for Nagiostats.
+
 %prep
 %setup -qc
 %patch0 -p1
@@ -45,7 +55,6 @@
 install -d $RPM_BUILD_ROOT{%{resourcedir},%{scriptsdir},%{nagioscgidir}}
 install -p check_nagios.sh $RPM_BUILD_ROOT%{scriptsdir}
 install -p mrtgstats.cgi $RPM_BUILD_ROOT%{nagioscgidir}
-
 cp -a *.xml $RPM_BUILD_ROOT%{resourcedir}
 
 %post
@@ -57,6 +66,11 @@
 %cacti_import_template %{resourcedir}/cacti_graph_template_nagios_statistics_-_service_problems.xml
 %cacti_import_template %{resourcedir}/cacti_host_template_nagios_statistics.xml
 
+%banner -o -e %{name} <<EOF
+You should install 'nagios-cgi-nagiostats' to Nagios servier which would be used
+to provide data for Cacti template.
+EOF
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -66,7 +80,8 @@
 %attr(755,root,root) %{scriptsdir}/check_nagios.sh
 %{resourcedir}/*.xml
 
-# nagios-cacti-nagiostats
+%files -n nagios-cgi-nagiostats
+%defattr(644,root,root,755)
 %attr(755,root,root) %{nagioscgidir}/mrtgstats.cgi
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -75,6 +90,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.6  2010/12/13 22:00:17  glen
+- put nagios addon to nagios-cgi-nagiostats pkg
+
 Revision 1.5  2010/12/13 12:27:26  glen
 - rfc compliant header termination
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cacti-template-nagiostats/cacti-template-nagiostats.spec?r1=1.5&r2=1.6&f=u