packages: cacti-template-varnish/cacti-template-varnish.spec - v0.0.3: comb...

[glen]

Author: glen                         Date: Tue Apr 13 16:33:24 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- v0.0.3: combine two templates: more graphs and use telnet port

---- Files affected:
packages/cacti-template-varnish:
   cacti-template-varnish.spec (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: packages/cacti-template-varnish/cacti-template-varnish.spec
diff -u packages/cacti-template-varnish/cacti-template-varnish.spec:1.2 packages/cacti-template-varnish/cacti-template-varnish.spec:1.3
--- packages/cacti-template-varnish/cacti-template-varnish.spec:1.2	Mon Apr 12 17:43:17 2010
+++ packages/cacti-template-varnish/cacti-template-varnish.spec	Tue Apr 13 18:33:18 2010
@@ -2,13 +2,14 @@
 %define		template	varnish
 Summary:	Varnish Cache statistics template for Cacti
 Name:		cacti-template-%{template}
-Version:	0.0.2
-Release:	1
+Version:	0.0.3
+Release:	0.2
 License:	GPL v2
 Group:		Applications/WWW
-Source0:	http://forums.cacti.net/download.php?id=16163&/varnish-cacti-stats-%{version}.zip
-# Source0-md5:	b7a4ff93877cbd395c58525887b52dd9
-URL:		http://forums.cacti.net/viewtopic.php?t=31260
+Source1:	get_varnish_stats.py
+Source2:	cacti_host_template_varnish.xml
+URL:		http://forums.cacti.net/viewtopic.php?p=182152
+BuildRequires:	unrar
 Requires:	cacti >= 0.8.6j
 Requires:	cacti-add_template
 BuildArch:	noarch
@@ -21,24 +22,24 @@
 %description
 Template for Cacti - Varnish Cache statistics.
 
-%prep
-%setup -q -n varnish-cacti-stats-%{version}
+Uses advanced template from
+<http://forums.cacti.net/viewtopic.php?p=182152>
+
+Combines script to pull data via varnish telnet port from
+<http://forums.cacti.net/viewtopic.php?t=31260>
 
-%{__sed} -i -e '
-s,/usr/bin/python &lt;path_cacti&gt;/scripts/get_varnish_stats.py,%{scriptsdir}/get_varnish_stats.py,
-' templates/*.xml
+%prep
+%setup -qcT
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{resourcedir},%{scriptsdir}}
-cp -a templates/*.xml $RPM_BUILD_ROOT%{resourcedir}
-install -p scripts/*.py $RPM_BUILD_ROOT%{scriptsdir}
+install -p %{SOURCE1} $RPM_BUILD_ROOT%{scriptsdir}
+cp -a %{SOURCE2} $RPM_BUILD_ROOT%{resourcedir}
 
 %post
 %{_sbindir}/cacti-add_template \
-	%{resourcedir}/cacti_data_template_varnish_statistics.xml \
-	%{resourcedir}/cacti_graph_template_varnish_-_cache_hitrate.xml \
-	%{resourcedir}/cacti_graph_template_varnish_-_number_of_requests.xml
+	%{resourcedir}/cacti_host_template_varnish.xml
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -54,6 +55,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.3  2010/04/13 16:33:18  glen
+- v0.0.3: combine two templates: more graphs and use telnet port
+
 Revision 1.2  2010/04/12 15:43:17  glen
 - fix script path
 
================================================================

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