- 1.630: cacti-0.8.7g/cacti-0.8.7h compat for %cacti_import_template

Changed files:
    rpm-build-macros.spec -> 1.312
    rpm.macros -> 1.631

diff --git a/rpm-build-macros.spec b/rpm-build-macros.spec
index d644d7724a75eb9d2e5d5dff78274582822973ef..090086ed775c2075930960b459eda2307fc6aaef 100644 (file)
--- a/rpm-build-macros.spec
+++ b/rpm-build-macros.spec
@@ -1,4 +1,4 @@
-%define                rpm_macros_rev  1.630
+%define                rpm_macros_rev  1.631
 %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 8d5ab662ff22b21e49310768586fcd056e556c1f..967bb880354034ad8f3e2382bb731d00e6212c80 100644 (file)
--- a/rpm.macros
+++ b/rpm.macros
@@ -1985,9 +1985,14 @@ else: \
 #
 # Requires:    cacti >= 0.8.7e-8
 # BuildRequires:       rpmbuild(macros) >= 1.630
+# Note: 1.1 (cacti-0.8.7h) adds requirement for --with-template-rras or --with-user-rras option
 
 %cacti_import_template() {\
-/usr/share/cacti/cli/import_template.php --filename=%1 --with-template-rras || :; \
+v=$(%{__sed} -rne 's/.+Add Graphs Script ([0-9\.]+).+/\1/p' /usr/share/cacti/cli/import_template.php); \
+if [ "$v" != "1.0" ]; then \
+       rra="--with-template-rras"; \
+fi; \
+/usr/share/cacti/cli/import_template.php --filename=%1 $rra || :; \
 }%{nil}
 
 # pre/post script for -upstart subpackages