- update to 0.9.6 from forum post

Changed files:
    cacti-template-snmpdiskio.spec -> 1.7

diff --git a/cacti-template-snmpdiskio.spec b/cacti-template-snmpdiskio.spec
index 5ba03b26f13db27b0ddaa0810f87018c8c30834a..82e7551eefe76b0153b1b833d2d0b17b9baca31e 100644 (file)
--- a/cacti-template-snmpdiskio.spec
+++ b/cacti-template-snmpdiskio.spec
@@ -2,13 +2,14 @@
 Summary:       Disk I/O statistics (Read/Write bytes) in Cacti
 Summary(pl.UTF-8):     Statystyki operacji dyskowych we/wy (odczyt/zapis w bajtach) w Cacti
 Name:          cacti-addons-snmpdiskio
-Version:       0.9.4
-Release:       0.3
+Version:       0.9.6
+Release:       1
 License:       GPL v2
 Group:         Applications/WWW
-Source0:       http://forums.cacti.net/files/%{plugin}-%{version}.tar.gz
-Patch0:                %{name}-bashism.patch
+Source0:       http://forums.cacti.net/files/%{plugin}-0.9.4.tar.gz
 # Source0-md5: 9f3512729ae6cad0904cac0fada719eb
+Patch0:                %{name}-bashism.patch
+Patch1:                %{name}-0.9.6.patch
 URL:           http://forums.cacti.net/about12742.html
 Requires:      cacti-add_template
 BuildArch:     noarch
@@ -41,8 +42,10 @@ dyskowego wejścia/wyjścia. Ta wersja udostępnia tylko jedną wartość:
 Disk I/O (w bajtach/sekundę).
 
 %prep
-%setup -q -n %{plugin}-%{version}
+%setup -q -c -n %{plugin}-%{version}
+mv %{plugin}-*/* .
 %patch0 -p1
+%patch1 -p1
 
 cat > snmp.%{plugin}.conf <<'EOF'
 exec .1.3.6.1.4.1.2021.54 hdNum %{_sbindir}/snmpdiskio hdNum
@@ -64,7 +67,10 @@ install snmpdiskio $RPM_BUILD_ROOT%{_sbindir}
 rm -rf $RPM_BUILD_ROOT
 
 %post
-%{_sbindir}/cacti-add_template %{resourcedir}/cacti_host_template_webserver_lighttpd.xml
+%{_sbindir}/cacti-add_template \
+       %{cactidir}/resource/script_queries/cacti_data_query_snmp_disk_statistics.xml \
+       %{cactidir}/resource/script_queries/cacti_graph_template_disk_io_bytessec.xml \
+       %{cactidir}/resource/snmp_queries/partition.xml
 
 %files
 %defattr(644,root,root,755)