- 1.630: %cacti_import_template, pass --with-template-rras (needed for mysql template)

Changed files:
    rpm-build-macros.spec -> 1.311
    rpm.macros -> 1.630

diff --git a/rpm-build-macros.spec b/rpm-build-macros.spec
index 254e31760fb148fbe1826193930ca4f8a8f16c64..d644d7724a75eb9d2e5d5dff78274582822973ef 100644 (file)
--- a/rpm-build-macros.spec
+++ b/rpm-build-macros.spec
@@ -1,4 +1,4 @@
-%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

diff --git a/rpm.macros b/rpm.macros
index d1d468a73ec15e2b1b832e4b92eec1477219307b..8d5ab662ff22b21e49310768586fcd056e556c1f 100644 (file)
--- a/rpm.macros
+++ b/rpm.macros
@@ -1984,10 +1984,10 @@ else: \
 # %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