- use cacti own import template; rel 2

Changed files:
    cacti-template-squidstats.spec -> 1.5

diff --git a/cacti-template-squidstats.spec b/cacti-template-squidstats.spec
index ab50b9965cf18d4cf81b534a91b40b6c7b990dab..0e9a1a2ab87d44f0ca8c5dc0e853067da5644d28 100644 (file)
--- a/cacti-template-squidstats.spec
+++ b/cacti-template-squidstats.spec
@@ -2,16 +2,16 @@
 Summary:       Squid Statistics template for Cacti
 Name:          cacti-template-%{template}
 Version:       0.1
-Release:       1
+Release:       2
 License:       GPL v2
 Group:         Applications/WWW
 Source0:       SquidStats-%{version}.zip
 # Source0-md5: a37de602c6e5495049a368d0d2c87549
 URL:           http://forums.cacti.net/about3158.html
+BuildRequires: rpmbuild(macros) >= 1.554
 BuildRequires: sed >= 4.0
 BuildRequires: unzip
-Requires:      cacti >= 0.8.6j
-Requires:      cacti-add_template
+Requires:      cacti >= 0.8.7e-8
 Obsoletes:     cacti-plugin-squidstats
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -25,18 +25,17 @@ BuildRoot:  %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Query and plot various metrics presented by Squid over SNMP.
 
 %prep
-%setup -q -c
-
-%{__sed} -i -e 's,\r$,,' *.txt
+%setup -qc
+%undos *.txt
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{resourcedir},%{snmpqueriesdir},%{scriptsdir}}
-cp -a webcache_squid_core.xml webcache_squid_median.xml $RPM_BUILD_ROOT%{snmpqueriesdir}
-cp -a cacti_host_template_webcache_squid_server_snmp.xml $RPM_BUILD_ROOT%{resourcedir}
+cp -p webcache_squid_core.xml webcache_squid_median.xml $RPM_BUILD_ROOT%{snmpqueriesdir}
+cp -p cacti_host_template_webcache_squid_server_snmp.xml $RPM_BUILD_ROOT%{resourcedir}
 
 %post
-%{_sbindir}/cacti-add_template %{resourcedir}/cacti_host_template_webcache_squid_server_snmp.xml
+%cacti_import_template %{resourcedir}/cacti_host_template_webcache_squid_server_snmp.xml
 
 %clean
 rm -rf $RPM_BUILD_ROOT