packages: rpm-build-macros/rpm.macros - 1.630: cacti-0.8.7g/cacti-0.8.7h co...

[glen]

Author: glen                         Date: Thu Dec 22 12:46:16 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- 1.630: cacti-0.8.7g/cacti-0.8.7h compat for %cacti_import_template

---- Files affected:
packages/rpm-build-macros:
   rpm.macros (1.630 -> 1.631) 

---- Diffs:

================================================================
Index: packages/rpm-build-macros/rpm.macros
diff -u packages/rpm-build-macros/rpm.macros:1.630 packages/rpm-build-macros/rpm.macros:1.631
--- packages/rpm-build-macros/rpm.macros:1.630	Wed Dec 21 17:46:51 2011
+++ packages/rpm-build-macros/rpm.macros	Thu Dec 22 13:46:11 2011
@@ -1985,9 +1985,14 @@
 #
 # 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
================================================================

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