[packages/cacti-template-snmpdiskio] fix xml error

glen glen at pld-linux.org
Mon Feb 10 11:33:25 CET 2014


commit de6dfd6e048be64af5660dabc560cc8a0ec0e34a
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Mon Feb 10 12:32:56 2014 +0200

    fix xml error

 cacti-template-snmpdiskio.spec |  6 ++++--
 xml-fix.patch                  | 12 ++++++++++++
 2 files changed, 16 insertions(+), 2 deletions(-)
---
diff --git a/cacti-template-snmpdiskio.spec b/cacti-template-snmpdiskio.spec
index b494607..588c749 100644
--- a/cacti-template-snmpdiskio.spec
+++ b/cacti-template-snmpdiskio.spec
@@ -4,7 +4,7 @@ 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-template-%{template}
 Version:	0.9.6
-Release:	6
+Release:	7
 License:	GPL v2
 Group:		Applications/WWW
 Source0:	http://forums.cacti.net/files/%{template}-0.9.4.tar.gz
@@ -13,6 +13,7 @@ Source1:	http://forums.cacti.net//files/partition_424.xml
 # Source1-md5:	d7e569dfe417f49c7b8a2fe5b5a52382
 Patch0:		bashism.patch
 Patch1:		%{template}-0.9.6.patch
+Patch2:		xml-fix.patch
 URL:		http://forums.cacti.net/about12742.html
 BuildRequires:	rpm-php-pearprov >= 4.4.2-11
 BuildRequires:	rpmbuild(macros) >= 1.554
@@ -33,9 +34,10 @@ w Cacti.
 %prep
 %setup -qc
 mv %{template}-*/* .
+cp -p %{SOURCE1} partition.xml
 %patch0 -p1
 %patch1 -p1
-cp -p %{SOURCE1} partition.xml
+%patch2 -p1
 
 %install
 rm -rf $RPM_BUILD_ROOT
diff --git a/xml-fix.patch b/xml-fix.patch
new file mode 100644
index 0000000..53493c1
--- /dev/null
+++ b/xml-fix.patch
@@ -0,0 +1,12 @@
+--- cacti-template-snmpdiskio-0.9.6/partition.xml~	2008-10-06 01:51:43.000000000 +0300
++++ cacti-template-snmpdiskio-0.9.6/partition.xml	2014-02-10 12:32:25.774576440 +0200
+@@ -2,7 +2,9 @@
+ 	<name>Get SNMP Partitions</name>
+ 	<description>Queries a host for a list of monitorable partitions</description>
+ 	<oid_index>.1.3.6.1.4.1.2021.13.15</oid_index>
++<!--
+ 	<index_order>hdDescr:hdName:hdIndex</index_order>
++-->
+ 	<index_order_type>numeric</index_order_type>
+ 	<index_title_format>|chosen_order_field|</index_title_format>
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/cacti-template-snmpdiskio.git/commitdiff/de6dfd6e048be64af5660dabc560cc8a0ec0e34a



More information about the pld-cvs-commit mailing list