[zabbix/f16] Update to 1.8.15

[Volker Fröhlich]

commit a9ac3c4300ae316f69e3daacd97b0f8ac16ab6e5
Author: Volker Fröhlich <volker27 at gmx.at>
Date:   Wed Aug 22 00:04:39 2012 +0200

    Update to 1.8.15
    
    - Update to new version
    - Rework patches to not leave backup files in the frontend

 .gitignore                  |    1 +
 sources                     |    2 +-
 zabbix-1.8.4-config.patch   |    8 ++++----
 zabbix-1.8.8-no-flash.patch |    8 ++++----
 zabbix.spec                 |    8 ++++++--
 5 files changed, 16 insertions(+), 11 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index eda20b9..56b60a3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@ zabbix-1.8.2.tar.gz
 /zabbix-1.8.12.tar.gz
 /zabbix-1.8.13.tar.gz
 /zabbix-1.8.14.tar.gz
+/zabbix-1.8.15.tar.gz
diff --git a/sources b/sources
index 486327c..bd73e2f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f8735ea210217d1eebeeacd0ac13c83e  zabbix-1.8.14.tar.gz
+bb1951b20c61c0f576c824d06f8318a6  zabbix-1.8.15.tar.gz
diff --git a/zabbix-1.8.4-config.patch b/zabbix-1.8.4-config.patch
index 9eee3f6..e9a1c9e 100644
--- a/zabbix-1.8.4-config.patch
+++ b/zabbix-1.8.4-config.patch
@@ -1,7 +1,7 @@
-diff -up zabbix-1.8.4/frontends/php/include/config.inc.php.orig zabbix-1.8.4/frontends/php/include/config.inc.php
---- zabbix-1.8.4/frontends/php/include/config.inc.php.orig	2011-01-04 14:57:51.000000000 +0100
-+++ zabbix-1.8.4/frontends/php/include/config.inc.php	2011-01-04 14:57:52.000000000 +0100
-@@ -116,8 +116,7 @@ function __autoload($class_name){
+diff -Nur zabbix-1.8.15/frontends/php/include/config.inc.php zabbix-1.8.15-config/frontends/php/include/config.inc.php
+--- zabbix-1.8.15/frontends/php/include/config.inc.php	2012-08-20 16:27:31.000000000 +0200
++++ zabbix-1.8.15-config/frontends/php/include/config.inc.php	2012-08-21 21:18:12.779499506 +0200
+@@ -119,8 +119,7 @@
  	$ZBX_LOCALNODEID = 0;
  	$ZBX_LOCMASTERID = 0;
  
diff --git a/zabbix-1.8.8-no-flash.patch b/zabbix-1.8.8-no-flash.patch
index b6796f8..fb5c5f6 100644
--- a/zabbix-1.8.8-no-flash.patch
+++ b/zabbix-1.8.8-no-flash.patch
@@ -1,7 +1,7 @@
-diff -up zabbix-1.8.8/frontends/php/include/screens.inc.php.no-flash zabbix-1.8.8/frontends/php/include/screens.inc.php
---- zabbix-1.8.8/frontends/php/include/screens.inc.php.no-flash	2011-10-05 11:26:07.000000000 +0200
-+++ zabbix-1.8.8/frontends/php/include/screens.inc.php	2011-10-05 11:26:30.000000000 +0200
-@@ -380,7 +380,6 @@ require_once('include/js.inc.php');
+diff -Nur zabbix-1.8.15/frontends/php/include/screens.inc.php zabbix-1.8.15-no-flash/frontends/php/include/screens.inc.php
+--- zabbix-1.8.15/frontends/php/include/screens.inc.php	2012-08-20 16:27:31.000000000 +0200
++++ zabbix-1.8.15-no-flash/frontends/php/include/screens.inc.php	2012-08-21 21:26:30.695997713 +0200
+@@ -351,7 +351,6 @@
  		$form->addVar('screenid',$_REQUEST['screenid']);
  // a-z order!!!
  		$cmbRes = new CCombobox('resourcetype',$resourcetype,'submit()');
diff --git a/zabbix.spec b/zabbix.spec
index 4830f05..64e3d69 100644
--- a/zabbix.spec
+++ b/zabbix.spec
@@ -8,13 +8,13 @@
 %global srcname zabbix
 
 Name:           zabbix
-Version:        1.8.14
+Version:        1.8.15
 Release:        1%{?dist}
 Summary:        Open-source monitoring solution for your IT infrastructure
 
 Group:          Applications/Internet
 License:        GPLv2+
-URL:            http://www.zabbix.com/
+URL:            http://www.zabbix.com
 Source0:        http://downloads.sourceforge.net/%{srcname}/%{srcname}-%{version}.tar.gz
 Source1:        zabbix-web.conf
 Source2:        zabbix-server.init
@@ -644,6 +644,10 @@ fi
 
 
 %changelog
+* Mon Aug 20 2012 Volker Fröhlich <volker27 at gmx.at> - 1.8.15-1
+- update to 1.8.15
+- Rework patches to not leave backup files in the frontend
+
 * Thu Jun 28 2012 Dan Horák <dan[at]danny.cz> - 1.8.14-1
 - update to 1.8.14