[zabbix20/el5] New upstream release 2.0.6

[Volker Fröhlich]

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

    New upstream release 2.0.6
    
    Conflicts:
    	zabbix20.spec

 .gitignore    |    1 +
 sources       |    2 +-
 zabbix20.spec |   19 ++++++-------------
 3 files changed, 8 insertions(+), 14 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 78ee855..e20f0b8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /zabbix-2.0.4.tar.gz
 /zabbix-2.0.4-free.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 c197421..f21f39f 100644
--- a/zabbix20.spec
+++ b/zabbix20.spec
@@ -33,8 +33,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
@@ -60,15 +60,6 @@ Patch1:         %{srcname}-2.0.3-fonts-config.patch
 # https://support.zabbix.com/browse/ZBX-4794
 Patch2:         %{srcname}-2.0.1-no-flash.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
@@ -262,8 +253,6 @@ sed -i '/su zabbix zabbix/d' %{SOURCE5}
 # https://support.zabbix.com/browse/ZBX-4794
 %patch2 -p1
 rm -f frontend/php/images/flash/zbxclock.swf
-%patch4 -p0
-%patch5 -p0
 
 # Remove bundled java libs
 rm -rf src/zabbix_java/lib/*.jar
@@ -681,6 +670,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