SPECS: cacti-addons-snmpdiskio.spec - with our net-snmpd (with diskio enabl...

[glen]

Author: glen                         Date: Sun Oct  5 22:51:44 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- with our net-snmpd (with diskio enabled) don't need extra wrapper
  see http://forums.cacti.net/viewtopic.php?t=12742&postdays=0&postorder=asc&start=75#132184
- rel 3

---- Files affected:
SPECS:
   cacti-addons-snmpdiskio.spec (1.9 -> 1.10) 

---- Diffs:

================================================================
Index: SPECS/cacti-addons-snmpdiskio.spec
diff -u SPECS/cacti-addons-snmpdiskio.spec:1.9 SPECS/cacti-addons-snmpdiskio.spec:1.10
--- SPECS/cacti-addons-snmpdiskio.spec:1.9	Sun Oct  5 23:34:49 2008
+++ SPECS/cacti-addons-snmpdiskio.spec	Mon Oct  6 00:51:38 2008
@@ -4,11 +4,13 @@
 Summary(pl.UTF-8):	Statystyki operacji dyskowych we/wy (odczyt/zapis w bajtach) w Cacti
 Name:		cacti-addons-snmpdiskio
 Version:	0.9.6
-Release:	2
+Release:	3
 License:	GPL v2
 Group:		Applications/WWW
 Source0:	http://forums.cacti.net/files/%{plugin}-0.9.4.tar.gz
 # Source0-md5:	9f3512729ae6cad0904cac0fada719eb
+Source1:	http://forums.cacti.net//files/partition_424.xml
+# Source1-md5:	d7e569dfe417f49c7b8a2fe5b5a52382
 Patch0:		%{name}-bashism.patch
 Patch1:		%{name}-0.9.6.patch
 URL:		http://forums.cacti.net/about12742.html
@@ -25,36 +27,12 @@
 Statystyki operacji dyskowych wejścia/wyjścia (odczyt/zapis w bajtach)
 w Cacti.
 
-%package -n snmpdiskio
-Summary:	Disk I/O statistics (Read/Write bytes) over SNMP
-Summary(pl.UTF-8):	Statystyki operacji dyskowych we/wy (odczyt/zapis w bajtach) po SNMP
-Group:		Applications
-Requires:	awk
-
-%description -n snmpdiskio
-This set of simple scripts gives you disk I/O statistics over SNMP;
-currently net-snmp has flaky or no support for disk I/O at all. This
-version gives you only one thing: Disk I/O (bytes/sec).
-
-%description -n snmpdiskio -l pl.UTF-8
-Ten zestaw prostych skryptów udostępnia statystyki wejścia/wyjścia dla
-dysków po SNMP; aktualnie net-snmp ma kiepską albo żadną obsługę
-dyskowego wejścia/wyjścia. Ta wersja udostępnia tylko jedną wartość:
-Disk I/O (w bajtach/sekundę).
-
 %prep
 %setup -q -c -n %{plugin}-%{version}
 mv %{plugin}-*/* .
 %patch0 -p1
 %patch1 -p1
-
-cat > snmpd.%{plugin}.conf <<'EOF'
-exec .1.3.6.1.4.1.2021.54 hdNum %{_sbindir}/snmpdiskio hdNum
-exec .1.3.6.1.4.1.2021.55 hdIndex %{_sbindir}/snmpdiskio hdIndex
-exec .1.3.6.1.4.1.2021.56 hdDescr %{_sbindir}/snmpdiskio hdDescr
-exec .1.3.6.1.4.1.2021.57 hdInBlocks %{_sbindir}/snmpdiskio hdInBlocks
-exec .1.3.6.1.4.1.2021.58 hdOutBlocks %{_sbindir}/snmpdiskio hdOutBlocks
-EOF
+cp %{SOURCE1} partition.xml
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -62,7 +40,6 @@
 install cacti_data_query_snmp_disk_statistics.xml $RPM_BUILD_ROOT%{cactidir}/resource
 install cacti_graph_template_disk_io_bytessec.xml $RPM_BUILD_ROOT%{cactidir}/resource
 install partition.xml  $RPM_BUILD_ROOT%{cactidir}/resource/snmp_queries
-install snmpdiskio $RPM_BUILD_ROOT%{_sbindir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -79,17 +56,17 @@
 %{cactidir}/resource/cacti_graph_template_disk_io_bytessec.xml
 %{cactidir}/resource/snmp_queries/partition.xml
 
-%files -n snmpdiskio
-%defattr(644,root,root,755)
-%doc README snmpd.%{plugin}.conf
-%attr(755,root,root) %{_sbindir}/snmpdiskio
-
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.10  2008/10/05 22:51:38  glen
+- with our net-snmpd (with diskio enabled) don't need extra wrapper
+  see http://forums.cacti.net/viewtopic.php?t=12742&postdays=0&postorder=asc&start=75#132184
+- rel 3
+
 Revision 1.9  2008/10/05 21:34:49  glen
 - do not put exported templates to script_queries dir
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/cacti-addons-snmpdiskio.spec?r1=1.9&r2=1.10&f=u