From a42b19b33b97743edbb1d867e2cd8ab6a949a92a Mon Sep 17 00:00:00 2001
From: =?utf8?q?Elan=20Ruusam=C3=A4e?= <glen@pld-linux.org>
Date: Thu, 22 Dec 2011 12:46:23 +0000
Subject: [PATCH] - 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
---
 rpm-build-macros.spec | 2 +-
 rpm.macros            | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/rpm-build-macros.spec b/rpm-build-macros.spec
index d644d77..090086e 100644
--- 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 8d5ab66..967bb88 100644
--- 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
-- 
2.44.0