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

[Volker Fröhlich]

commit fca05036d8f2d74db983a7a3f7aac36cee9c6c70
Author: Volker Fröhlich <volker27 at gmx.at>
Date:   Wed Aug 27 17:45:07 2014 +0200

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

 .gitignore  |    1 +
 sources     |    2 +-
 zabbix.spec |   12 +++++++-----
 3 files changed, 9 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7aaf5c3..d9b8b6c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,3 +27,4 @@ zabbix-1.8.2.tar.gz
 /zabbix-2.2.3-free.tar.gz
 /zabbix-2.2.4-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/zabbix.spec b/zabbix.spec
index aa46a4a..89454c8 100644
--- a/zabbix.spec
+++ b/zabbix.spec
@@ -14,16 +14,14 @@
 %global srcname zabbix
 
 Name:           zabbix
-Version:        2.2.5
-Release:        2%{?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:        %{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
+
 * Mon Aug 18 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild