[zabbix22/el5] New upstream release 2.2.6, now with all-free sources (json)

[Volker Fröhlich]

commit 96f2f6999951c96a3188f22ad32e473dfb800d44
Author: Volker Fröhlich <volker27 at gmx.at>
Date:   Wed Aug 27 18:16:19 2014 +0200

    New upstream release 2.2.6, now with all-free sources (json)

 .gitignore    |    1 +
 sources       |    2 +-
 zabbix22.spec |   12 +++++++-----
 3 files changed, 9 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ffc2ced..f354692 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /zabbix-2.2.1-free.tar.gz
 /zabbix-2.2.5-free.tar.gz
+/zabbix-2.2.6.tar.gz
diff --git a/sources b/sources
index 55e9e67..cef5d78 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-13e145f05b5319f4f17f976fb328829a  zabbix-2.2.5-free.tar.gz
+38bc2407f80053d71853bb3419da364a  zabbix-2.2.6.tar.gz
diff --git a/zabbix22.spec b/zabbix22.spec
index a8a7791..18fc9ea 100644
--- a/zabbix22.spec
+++ b/zabbix22.spec
@@ -8,17 +8,15 @@
 %global srcname zabbix
 
 Name:           zabbix22
-Version:        2.2.5
-Release:        3%{?dist}
+Version:        2.2.6
+Release:        1%{?dist}
 Summary:        Open-source monitoring solution for your IT infrastructure
 
 Group:          Applications/Internet
 License:        GPLv2+
 URL:            http://www.zabbix.com
-#Source0:        http://downloads.sourceforge.net/%{srcname}/%{srcname}-%{version}.tar.gz
-# upstream tarball minus src/zabbix_java/lib/org-json-2010-12-28.jar
+Source0:        http://downloads.sourceforge.net/%{srcname}/%{srcname}-%{version}.tar.gz
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-Source0:        %{srcname}-%{version}-free.tar.gz
 Source1:        %{srcname}-web.conf
 Source2:        %{srcname}-server.init
 Source3:        %{srcname}-agent.init
@@ -694,6 +692,10 @@ fi
 %files web-pgsql
 
 %changelog
+* Wed Aug 27 2014 Volker Fröhlich <volker27 at gmx.at> - 2.2.6-1
+- New upstream release
+- Use the upstream tarball, now that non-free json was replaced with android-json
+
 * Thu Aug 21 2014 Volker Fröhlich <volker27 at gmx.at> - 2.2.5-3
 - Correct Requires php53-gettext --> php53-php-gettext