[zabbix20/el6] Include patch for ZBX-6290

[Volker Fröhlich]

commit 3a52765f17656b4515d92f0bd1b5a30704c099c0
Author: Volker Fröhlich <volker27 at gmx.at>
Date:   Thu Mar 7 11:48:21 2013 +0100

    Include patch for ZBX-6290

 zabbix-2.0.5-zbx6290.patch |   21 +++++++++++++++++++++
 zabbix20.spec              |   11 ++++++++++-
 2 files changed, 31 insertions(+), 1 deletions(-)
---
diff --git a/zabbix-2.0.5-zbx6290.patch b/zabbix-2.0.5-zbx6290.patch
new file mode 100644
index 0000000..a75e4f1
--- /dev/null
+++ b/zabbix-2.0.5-zbx6290.patch
@@ -0,0 +1,21 @@
+Index: frontends/php/include/maps.inc.php
+===================================================================
+--- frontends/php/include/maps.inc.php	(revision 33831)
++++ frontends/php/include/maps.inc.php	(revision 33834)
+@@ -1019,14 +1019,14 @@
+ 		}
+ 	}
+ 
+-	// get hosts data
++	// get host inventories
+ 	if ($sysmap['iconmapid']) {
+ 		$hostInventories = API::Host()->get(array(
+ 			'hostids' => $hostsToGetInventories,
+ 			'output' => API_OUTPUT_SHORTEN,
+ 			'nopermissions' => true,
+ 			'preservekeys' => true,
+-			'selectInventory' => array('hostid')
++			'selectInventory' => API_OUTPUT_EXTEND
+ 		));
+ 	}
+ 
diff --git a/zabbix20.spec b/zabbix20.spec
index 2ba6f7b..122a32e 100644
--- a/zabbix20.spec
+++ b/zabbix20.spec
@@ -36,7 +36,7 @@
 
 Name:           zabbix20
 Version:        2.0.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Open-source monitoring solution for your IT infrastructure
 
 Group:          Applications/Internet
@@ -72,6 +72,11 @@ Patch2:         %{srcname}-2.0.1-no-flash.patch
 # adapt for fping3 - https://support.zabbix.com/browse/ZBX-4894
 Patch3:         %{srcname}-1.8.12-fping3.patch
 
+# https://support.zabbix.com/browse/ZBX-6290
+# Icon mapping broken on maps
+# Solved in releases after 2.0.5
+Patch4:         %{srcname}-2.0.5-zbx6290.patch
+
 BuildRequires:   mysql-devel
 BuildRequires:   postgresql-devel
 BuildRequires:   sqlite-devel
@@ -287,6 +292,7 @@ Zabbix web frontend for PostgreSQL
 %if 0%{?fedora}
 %patch3 -p1
 %endif
+%patch4 -p0
 
 # Logrotate's su option is currently only available in Fedora
 %if 0%{?rhel}
@@ -864,6 +870,9 @@ fi
 %files web-pgsql
 
 %changelog
+* Tue Feb 12 2013 Volker Fröhlich <volker27 at gmx.at> - 2.0.5-2
+- Include patch for ZBX-6290
+
 * Tue Feb 12 2013 Volker Fröhlich <volker27 at gmx.at> - 2.0.5-1
 - New upstream release
 - Drop now-included patches