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

[glen]

Author: glen                         Date: Wed Dec 21 16:46:56 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- 1.630: %cacti_import_template, pass --with-template-rras (needed for mysql template)

---- Files affected:
packages/rpm-build-macros:
   rpm-build-macros.spec (1.310 -> 1.311) , rpm.macros (1.629 -> 1.630) 

---- Diffs:

================================================================
Index: packages/rpm-build-macros/rpm-build-macros.spec
diff -u packages/rpm-build-macros/rpm-build-macros.spec:1.310 packages/rpm-build-macros/rpm-build-macros.spec:1.311
--- packages/rpm-build-macros/rpm-build-macros.spec:1.310	Wed Dec 14 22:21:09 2011
+++ packages/rpm-build-macros/rpm-build-macros.spec	Wed Dec 21 17:46:51 2011
@@ -1,5 +1,5 @@
 # $Revision$, $Date$
-%define		rpm_macros_rev	1.629
+%define		rpm_macros_rev	1.630
 %define		find_lang_rev	1.35
 Summary:	PLD Linux RPM build macros
 Summary(pl.UTF-8):	Makra do budowania pakietów RPM dla Linuksa PLD
@@ -92,6 +92,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.311  2011/12/21 16:46:51  glen
+- 1.630: %cacti_import_template, pass --with-template-rras (needed for mysql template)
+
 Revision 1.310  2011/12/14 21:21:09  lisu
 - keep sync with rpm.macros revision
 

================================================================
Index: packages/rpm-build-macros/rpm.macros
diff -u packages/rpm-build-macros/rpm.macros:1.629 packages/rpm-build-macros/rpm.macros:1.630
--- packages/rpm-build-macros/rpm.macros:1.629	Wed Dec  7 01:48:23 2011
+++ packages/rpm-build-macros/rpm.macros	Wed Dec 21 17:46:51 2011
@@ -1984,10 +1984,10 @@
 # %cacti_import_template %{resourcedir}/cacti_host_template_varnish.xml
 #
 # Requires:	cacti >= 0.8.7e-8
-# BuildRequires:	rpmbuild(macros) >= 1.554
+# BuildRequires:	rpmbuild(macros) >= 1.630
 
 %cacti_import_template() {\
-/usr/share/cacti/cli/import_template.php --filename=%1 || :; \
+/usr/share/cacti/cli/import_template.php --filename=%1 --with-template-rras || :; \
 }%{nil}
 
 # pre/post script for -upstart subpackages
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm-build-macros/rpm-build-macros.spec?r1=1.310&r2=1.311&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm-build-macros/rpm.macros?r1=1.629&r2=1.630&f=u