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

[Volker Fröhlich]

commit a27545d77d9ca261350c1ea8ede5738e908832ff
Author: Volker Fröhlich <volker27 at gmx.at>
Date:   Wed Aug 27 18:10:48 2014 +0200

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

 .gitignore    |    1 +
 sources       |    2 +-
 zabbix22.spec |   10 ++++++----
 3 files changed, 8 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9365117..4e7cade 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /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 69f4702..58c63f5 100644
--- a/zabbix22.spec
+++ b/zabbix22.spec
@@ -14,16 +14,14 @@
 %global srcname zabbix
 
 Name:           zabbix22
-Version:        2.2.5
+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:        %{srcname}-%{version}-free.tar.gz
+Source0:        http://downloads.sourceforge.net/%{srcname}/%{srcname}-%{version}.tar.gz
 Source1:        %{srcname}-web.conf
 Source5:        %{srcname}-logrotate.in
 Source9:        %{srcname}-tmpfiles-zabbix.conf
@@ -721,6 +719,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
+
 * Fri Jul 18 2014 Volker Fröhlich <volker27 at gmx.at> - 2.2.5-1
 - New upstream release