Author: glen                         Date: Wed Apr 14 15:11:29 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated template
- use cacti's own import template command

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

---- Diffs:

================================================================
Index: packages/cacti-template-varnish/cacti-template-varnish.spec
diff -u packages/cacti-template-varnish/cacti-template-varnish.spec:1.3 
packages/cacti-template-varnish/cacti-template-varnish.spec:1.4
--- packages/cacti-template-varnish/cacti-template-varnish.spec:1.3     Tue Apr 
13 18:33:18 2010
+++ packages/cacti-template-varnish/cacti-template-varnish.spec Wed Apr 14 
17:11:20 2010
@@ -3,15 +3,13 @@
 Summary:       Varnish Cache statistics template for Cacti
 Name:          cacti-template-%{template}
 Version:       0.0.3
-Release:       0.2
+Release:       0.3
 License:       GPL v2
 Group:         Applications/WWW
 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
+Requires:      cacti >= 0.8.7e-8
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -19,6 +17,8 @@
 %define                resourcedir             %{cactidir}/resource
 %define                scriptsdir              %{cactidir}/scripts
 
+%define                cacti_import_template() 
/usr/share/cacti/cli/import_template.php --filename=%1 || :
+
 %description
 Template for Cacti - Varnish Cache statistics.
 
@@ -38,8 +38,7 @@
 cp -a %{SOURCE2} $RPM_BUILD_ROOT%{resourcedir}
 
 %post
-%{_sbindir}/cacti-add_template \
-       %{resourcedir}/cacti_host_template_varnish.xml
+%cacti_import_template %{resourcedir}/cacti_host_template_varnish.xml
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -55,6 +54,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.4  2010/04/14 15:11:20  glen
+- updated template
+- use cacti's own import template command
+
 Revision 1.3  2010/04/13 16:33:18  glen
 - v0.0.3: combine two templates: more graphs and use telnet port
 
================================================================

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

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to