up to 14 (Updated templates to latest Cacti build 0.8.8b)

diff --git a/cacti-template-windows.spec b/cacti-template-windows.spec
index 6dbd5fe6a5f5908975d8e8e909caa1467bdabf53..9f7538a3b3555ddfdb7e7893580e07d911b3523a 100644 (file)
--- a/cacti-template-windows.spec
+++ b/cacti-template-windows.spec
@@ -1,18 +1,16 @@
 %define                template        windows
 Summary:       Cacti WinXP-Win8, Win2000-Server 2012 x32/x64 Templates
 Name:          cacti-template-%{template}
-Version:       13
+Version:       14
 Release:       1
 License:       Apache v2.0
 Group:         Applications/WWW
-Source0:       Cacti_SNMP_Informant_Standard_Metrics_v%{version}.zip
-# Source0-md5: 90f356a61f786cab266f4aea82fc3cf6
-# https://github.com/mrlesmithjr/cacti/
+Source0:       https://github.com/mrlesmithjr/cacti/archive/e2481cbb/%{template}-%{version}.tar.gz
+# Source0-md5: df37a4594527d53bb5070c9c21e8e709
 URL:           http://forums.cacti.net/viewtopic.php?f=12&t=29832
 BuildRequires: rpm-pythonprov
 BuildRequires: rpmbuild(macros) >= 1.554
-BuildRequires: unzip
-Requires:      cacti >= 0.8.8a
+Requires:      cacti >= 0.8.8b
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -23,7 +21,8 @@ BuildRoot:    %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 SNMP Informant Standard Metrics for Windows Devices.
 
 %prep
-%setup -q -n Cacti_SNMP_Informant_Standard_Metrics_v%{version}
+%setup -qc
+mv cacti-*/* .
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -37,22 +36,18 @@ cp -a template/* $RPM_BUILD_ROOT%{resourcedir}
 %cacti_import_template %{resourcedir}/cacti_data_query_snmp_informant_standard_-_memory_statistics.xml
 %cacti_import_template %{resourcedir}/cacti_data_query_snmp_informant_standard_-_network_statistics.xml
 %cacti_import_template %{resourcedir}/cacti_data_query_snmp_informant_standard_-_objects_statistics.xml
-%cacti_import_template %{resourcedir}/cacti_host_template_windows_host_-_snmp_informant.xml
+%cacti_import_template %{resourcedir}/cacti_host_template_snmp_informant_windows.xml
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc readme.txt
+%doc README LICENSE
 %{resourcedir}/cacti_data_query_snmp_informant_standard_-_cpu_statistics.xml
 %{resourcedir}/cacti_data_query_snmp_informant_standard_-_disk_statistics.xml
 %{resourcedir}/cacti_data_query_snmp_informant_standard_-_memory_statistics.xml
 %{resourcedir}/cacti_data_query_snmp_informant_standard_-_network_statistics.xml
 %{resourcedir}/cacti_data_query_snmp_informant_standard_-_objects_statistics.xml
-%{resourcedir}/cacti_host_template_windows_host_-_snmp_informant.xml
-%{resourcedir}/snmp_queries/snmp_informant_standard_cpu.xml
-%{resourcedir}/snmp_queries/snmp_informant_standard_disk.xml
-%{resourcedir}/snmp_queries/snmp_informant_standard_memory.xml
-%{resourcedir}/snmp_queries/snmp_informant_standard_network.xml
-%{resourcedir}/snmp_queries/snmp_informant_standard_objects.xml
+%{resourcedir}/cacti_host_template_snmp_informant_windows.xml
+%{resourcedir}/snmp_queries/*.xml