From 7b16dacdb446fdf3059b9115e1445ed9d2004ac6 Mon Sep 17 00:00:00 2001 From: Denis Silakov Date: Fri, 25 Jul 2014 16:15:16 +0400 Subject: [PATCH 1/3] MassBuild#464: Increase release tag --- zabbix.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zabbix.spec b/zabbix.spec index 105374f..3a81fec 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -10,7 +10,7 @@ Summary: Open-source monitoring solution for your IT infrastructure Name: zabbix Version: 2.0.1 -Release: 2 +Release: 3 License: GPLv2+ Group: Monitoring Url: http://www.zabbix.com/ From 8d390cb030754fc9ab557ef44b8a46a1cd3d6b33 Mon Sep 17 00:00:00 2001 From: Denis Silakov Date: Mon, 26 Jan 2015 06:24:40 -0500 Subject: [PATCH 2/3] Updated to 2.0.14 --- .abf.yml | 3 ++- zabbix-2.0.1-fonts-config.patch | 12 ------------ zabbix-2.0.14-fonts-config.patch | 12 ++++++++++++ zabbix.spec | 8 ++++---- 4 files changed, 18 insertions(+), 17 deletions(-) delete mode 100644 zabbix-2.0.1-fonts-config.patch create mode 100644 zabbix-2.0.14-fonts-config.patch diff --git a/.abf.yml b/.abf.yml index 549b959..b2dce25 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,2 +1,3 @@ sources: - "zabbix-2.0.1-free.tar.gz": f89cd75d92e5c9e8be8067742c26930131310b07 + zabbix-2.0.1-free.tar.gz: f89cd75d92e5c9e8be8067742c26930131310b07 + zabbix-2.0.14.tar.gz: 72ad425939517b93a773e20d42a26949f524e827 diff --git a/zabbix-2.0.1-fonts-config.patch b/zabbix-2.0.1-fonts-config.patch deleted file mode 100644 index 6f0e23d..0000000 --- a/zabbix-2.0.1-fonts-config.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up zabbix-2.0.1/frontends/php/include/defines.inc.php.orig zabbix-2.0.1/frontends/php/include/defines.inc.php ---- zabbix-2.0.1/frontends/php/include/defines.inc.php.orig 2012-06-27 23:03:03.000000000 +0200 -+++ zabbix-2.0.1/frontends/php/include/defines.inc.php 2012-07-12 16:19:11.000000000 +0200 -@@ -31,7 +31,7 @@ define('ZBX_PERIOD_DEFAULT', 3600); // - - define('ZBX_WIDGET_ROWS', 20); - --define('ZBX_FONTPATH', realpath('fonts')); // where to search for font (GD > 2.0.18) -+define('ZBX_FONTPATH', '/usr/share/fonts/dejavu'); // where to search for font (GD > 2.0.18) - define('ZBX_GRAPH_FONT_NAME', 'DejaVuSans'); // font file name - define('ZBX_GRAPH_LEGEND_HEIGHT', 120); // when graph height is less then this value, some legend will not show up - diff --git a/zabbix-2.0.14-fonts-config.patch b/zabbix-2.0.14-fonts-config.patch new file mode 100644 index 0000000..38eb0a3 --- /dev/null +++ b/zabbix-2.0.14-fonts-config.patch @@ -0,0 +1,12 @@ +diff -Naur zabbix-2.0.14.orig/frontends/php/include/defines.inc.php zabbix-2.0.14/frontends/php/include/defines.inc.php +--- zabbix-2.0.14.orig/frontends/php/include/defines.inc.php 2015-01-26 06:17:53.507225392 -0500 ++++ zabbix-2.0.14/frontends/php/include/defines.inc.php 2015-01-26 06:18:22.643275950 -0500 +@@ -34,7 +34,7 @@ + + define('ZBX_WIDGET_ROWS', 20); + +-define('ZBX_FONTPATH', realpath('fonts')); // where to search for font (GD > 2.0.18) ++define('ZBX_FONTPATH', '/usr/share/fonts/dejavu'); // where to search for font (GD > 2.0.18) + define('ZBX_GRAPH_FONT_NAME', 'DejaVuSans'); // font file name + define('ZBX_GRAPH_LEGEND_HEIGHT', 120); // when graph height is less then this value, some legend will not show up + diff --git a/zabbix.spec b/zabbix.spec index 3a81fec..4ab8bfb 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -9,12 +9,12 @@ Summary: Open-source monitoring solution for your IT infrastructure Name: zabbix -Version: 2.0.1 -Release: 3 +Version: 2.0.14 +Release: 1 License: GPLv2+ Group: Monitoring Url: http://www.zabbix.com/ -Source0: http://downloads.sourceforge.net/%{srcname}/%{srcname}-%{version}-free.tar.gz +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 Source1: zabbix-web.conf @@ -33,7 +33,7 @@ Source16: zabbix-server-sqlite3.service # local rules for config files Patch0: zabbix-2.0.1-config.patch # local rules for config files - fonts -Patch1: zabbix-2.0.1-fonts-config.patch +Patch1: zabbix-2.0.14-fonts-config.patch # remove flash content (#737337) # https://support.zabbix.com/browse/ZBX-4794 Patch2: zabbix-2.0.1-no-flash.patch From 583d50e289cee3bdceaefa14fc50834c3a66f6e5 Mon Sep 17 00:00:00 2001 From: Denis Silakov Date: Mon, 26 Jan 2015 06:40:49 -0500 Subject: [PATCH 3/3] Fix /run usage --- zabbix.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/zabbix.spec b/zabbix.spec index 4ab8bfb..b4ff556 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -83,7 +83,6 @@ multitude of servers. %config(noreplace) %{_sysconfdir}/tmpfiles.d/zabbix.conf %attr(0755,zabbix,zabbix) %dir %{_localstatedir}/lib/%{srcname} %attr(0755,zabbix,zabbix) %dir %{_localstatedir}/log/%{srcname} -%attr(0755,zabbix,zabbix) %dir %{_localstatedir}/run/%{srcname} %{_bindir}/zabbix_get %{_bindir}/zabbix_sender %{_mandir}/man1/zabbix_get.1*