[zabbix] New upstream release 2.0.5

[Volker Fröhlich]

commit 65e4c8267a07fbf3c700b7909fb8d7f620d69a7e
Author: Volker Fröhlich <volker27 at gmx.at>
Date:   Tue Feb 12 15:59:58 2013 +0100

    New upstream release 2.0.5

 .gitignore                             |    2 +
 sources                                |    2 +-
 zabbix-2.0.3-snmp-source-address.patch |   22 -----------
 zabbix-2.0.4-ldap.patch                |   66 --------------------------------
 zabbix-2.0.4-snmptrap.patch            |   23 -----------
 zabbix.spec                            |   21 +++-------
 6 files changed, 9 insertions(+), 127 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 346c9e2..4f3dbe9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,5 @@ zabbix-1.8.2.tar.gz
 /zabbix-2.0.1-free.tar.gz
 /zabbix-2.0.3-free.tar.gz
 /zabbix-2.0.4-free.tar.gz
+/zabbix-2.0.5.tar.gz
+/zabbix-2.0.5-free.tar.gz
diff --git a/sources b/sources
index 93e4086..280ddc1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9762c41929f2fe775ce8238890314a60  zabbix-2.0.4-free.tar.gz
+beb0d36bd18abe3ddd4a7c6c0f2b9093  zabbix-2.0.5-free.tar.gz
diff --git a/zabbix.spec b/zabbix.spec
index 740d99f..c86ec67 100644
--- a/zabbix.spec
+++ b/zabbix.spec
@@ -35,8 +35,8 @@
 %global srcname zabbix
 
 Name:           zabbix
-Version:        2.0.4
-Release:        5%{?dist}
+Version:        2.0.5
+Release:        1%{?dist}
 Summary:        Open-source monitoring solution for your IT infrastructure
 
 Group:          Applications/Internet
@@ -71,16 +71,6 @@ Patch1:         %{srcname}-2.0.3-fonts-config.patch
 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
-# Setting source IP address rendered SNMP polling broken
-# https://support.zabbix.com/browse/ZBX-3379
-Patch4:         %{srcname}-2.0.3-snmp-source-address.patch
-
-#https://support.zabbix.com/browse/ZBX-6101
-Patch5:         %{srcname}-2.0.4-snmptrap.patch
-
-#https://support.zabbix.com/browse/ZBX-6097
-#CVE-2013-1364
-Patch6:         %{srcname}-2.0.4-ldap.patch
 
 BuildRequires:   mysql-devel
 BuildRequires:   postgresql-devel
@@ -302,9 +292,6 @@ Zabbix web frontend for PostgreSQL
 %if 0%{?rhel}
 sed -i '/su zabbix zabbix/d' %{SOURCE5}
 %endif
-%patch4 -p0
-%patch5 -p0
-%patch6 -p0
 
 # Remove flash applet
 # https://support.zabbix.com/browse/ZBX-4794
@@ -875,6 +862,10 @@ fi
 %files web-pgsql
 
 %changelog
+* Tue Feb 12 2013 Volker Fröhlich <volker27 at gmx.at> - 2.0.5-1
+- New upstream release
+- Drop now-included patches
+
 * Tue Jan 22 2013 Volker Fröhlich <volker27 at gmx.at> - 2.0.4-5
 - Remove zabbix_get plus manpage from the proxy files section
 - Solve conflict for externalscripts symlink between proxy and