[zabbix20/el6] New upstream release 2.0.6

[Volker Fröhlich]

commit c4be78932fcac298cf80468550594e5d39b82e42
Author: Volker Fröhlich <volker27 at gmx.at>
Date:   Mon Apr 22 15:29:54 2013 +0200

    New upstream release 2.0.6

 .gitignore    |    1 +
 sources       |    2 +-
 zabbix20.spec |   19 ++++++-------------
 3 files changed, 8 insertions(+), 14 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 672730a..de1b02d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /zabbix-2.0.4-free.tar.gz
 /zabbix-2.0.5.tar.gz
 /zabbix-2.0.5-free.tar.gz
+/zabbix-2.0.6-free.tar.gz
diff --git a/sources b/sources
index 280ddc1..bf98dab 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-beb0d36bd18abe3ddd4a7c6c0f2b9093  zabbix-2.0.5-free.tar.gz
+d480122e6cfb0983d9946148d82a0b8b  zabbix-2.0.6-free.tar.gz
diff --git a/zabbix20.spec b/zabbix20.spec
index b6904e6..5153ca6 100644
--- a/zabbix20.spec
+++ b/zabbix20.spec
@@ -35,8 +35,8 @@
 %global srcname zabbix
 
 Name:           zabbix20
-Version:        2.0.5
-Release:        3%{?dist}
+Version:        2.0.6
+Release:        1%{?dist}
 Summary:        Open-source monitoring solution for your IT infrastructure
 
 Group:          Applications/Internet
@@ -72,15 +72,6 @@ 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
-
-# Specific node-ids leave the frontend broken
-# Solved in releases after 2.0.5
-Patch5:         %{srcname}-2.0.5-zbx6318.patch
-
 BuildRequires:   mysql-devel
 BuildRequires:   postgresql-devel
 BuildRequires:   sqlite-devel
@@ -296,8 +287,6 @@ Zabbix web frontend for PostgreSQL
 %if 0%{?fedora}
 %patch3 -p1
 %endif
-%patch4 -p0
-%patch5 -p0
 
 # Logrotate's su option is currently only available in Fedora
 %if 0%{?rhel}
@@ -875,6 +864,10 @@ fi
 %files web-pgsql
 
 %changelog
+* Mon Apr 22 2013 Volker Fröhlich <volker27 at gmx.at> - 2.0.6-1
+- New upstream release
+- Drop ZBX-6290 and ZBX-6318 patches
+
 * Tue Mar 19 2013 Volker Fröhlich <volker27 at gmx.at> - 2.0.5-3
 - Include patch for ZBX-6318