packages: cacti-template-varnish/cacti-template-varnish.spec - use rpm macr...

[glen]

Author: glen                         Date: Wed Apr 14 21:16:03 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- use rpm macros for cacti_import_template
- conflict with spine with small result buffer

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

---- Diffs:

================================================================
Index: packages/cacti-template-varnish/cacti-template-varnish.spec
diff -u packages/cacti-template-varnish/cacti-template-varnish.spec:1.4 packages/cacti-template-varnish/cacti-template-varnish.spec:1.5
--- packages/cacti-template-varnish/cacti-template-varnish.spec:1.4	Wed Apr 14 17:11:20 2010
+++ packages/cacti-template-varnish/cacti-template-varnish.spec	Wed Apr 14 23:15:57 2010
@@ -3,13 +3,15 @@
 Summary:	Varnish Cache statistics template for Cacti
 Name:		cacti-template-%{template}
 Version:	0.0.3
-Release:	0.3
+Release:	0.5
 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:	rpmbuild(macros) >= 1.554
 Requires:	cacti >= 0.8.7e-8
+Conflicts:	cacti-spine < 0.8.7e-3
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -17,8 +19,6 @@
 %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.
 
@@ -54,6 +54,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.5  2010/04/14 21:15:57  glen
+- use rpm macros for cacti_import_template
+- conflict with spine with small result buffer
+
 Revision 1.4  2010/04/14 15:11:20  glen
 - updated template
 - use cacti's own import template command
================================================================

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