packages: rpm-build-macros/rpm-build-macros.spec, rpm-build-macros/rpm.macr...

[glen]

Author: glen                         Date: Wed Apr 14 15:32:06 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- 1.554: add %cacti_import_template

---- Files affected:
packages/rpm-build-macros:
   rpm-build-macros.spec (1.249 -> 1.250) , rpm.macros (1.553 -> 1.554) 

---- Diffs:

================================================================
Index: packages/rpm-build-macros/rpm-build-macros.spec
diff -u packages/rpm-build-macros/rpm-build-macros.spec:1.249 packages/rpm-build-macros/rpm-build-macros.spec:1.250
--- packages/rpm-build-macros/rpm-build-macros.spec:1.249	Sun Apr  4 16:48:00 2010
+++ packages/rpm-build-macros/rpm-build-macros.spec	Wed Apr 14 17:32:00 2010
@@ -1,5 +1,5 @@
 # $Revision$, $Date$
-%define		rpm_macros_rev	1.553
+%define		rpm_macros_rev	1.554
 %define		find_lang_rev	1.32
 Summary:	PLD Linux RPM build macros
 Summary(pl.UTF-8):	Makra do budowania pakietów RPM dla Linuksa PLD
@@ -90,6 +90,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.250  2010/04/14 15:32:00  glen
+- 1.554: add %cacti_import_template
+
 Revision 1.249  2010/04/04 14:48:00  pawelz
 - up to 1.553 (fixed %undos macro)
 

================================================================
Index: packages/rpm-build-macros/rpm.macros
diff -u packages/rpm-build-macros/rpm.macros:1.553 packages/rpm-build-macros/rpm.macros:1.554
--- packages/rpm-build-macros/rpm.macros:1.553	Thu Apr  1 16:54:32 2010
+++ packages/rpm-build-macros/rpm.macros	Wed Apr 14 17:32:00 2010
@@ -1840,4 +1840,23 @@
 	fi; \
 }%{nil}
 
+# Import or update Cacti template.
+#
+# Author: Elan Ruusamäe <glen at pld-linux.org>
+#
+# Usage:
+# %cacti_import_template XMLFILE
+#  XMLFILE -- XML template to import
+#
+# Sample:
+# %post
+# %cacti_import_template %{resourcedir}/cacti_host_template_varnish.xml
+#
+# Requires:	cacti >= 0.8.7e-8
+# BuildRequires:	rpmbuild(macros) >= 1.554
+
+%cacti_import_template() {\
+/usr/share/cacti/cli/import_template.php --filename=%1 || :; \
+}%{nil}
+
 # vim:ts=4 sw=4 noet ft=spec
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm-build-macros/rpm-build-macros.spec?r1=1.249&r2=1.250&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm-build-macros/rpm.macros?r1=1.553&r2=1.554&f=u