[zabbix20/el6] Re-add patch for traceroute path in SQL dumps

Volker Fröhlich volter at fedoraproject.org
Sat Feb 9 16:44:53 UTC 2013


commit 110cd4715df4a3b43cc0ddd9d08479dac7614d50
Author: Volker Fröhlich <volker27 at gmx.at>
Date:   Sat Feb 9 17:41:04 2013 +0100

    Re-add patch for traceroute path in SQL dumps

 zabbix20.spec |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)
---
diff --git a/zabbix20.spec b/zabbix20.spec
index c06cb83..14c0286 100644
--- a/zabbix20.spec
+++ b/zabbix20.spec
@@ -333,12 +333,11 @@ rm -f frontends/php/include/.htaccess
 rm -f frontends/php/api/.htaccess
 rm -f frontends/php/conf/.htaccess
 
-# Remove dispensable COPYING
-# https://support.zabbix.com/browse/ZBX-5568
-# Solved for releases after 2.0.3
-rm -rf frontends/php/conf/COPYING
+# Fix path to traceroute utility
+# Probably obsolete after EL 6
+find database -name 'data.sql' -exec sed -i 's|/usr/bin/traceroute|/bin/traceroute|' {} \;
 
-# set timestamp on modified config file and directories
+# Set timestamp on modified config file and directories
 touch -r frontends/php/css.css frontends/php/include/config.inc.php \
     frontends/php/include/defines.inc.php \
     frontends/php/include \
@@ -878,6 +877,10 @@ fi
 %files web-pgsql
 
 %changelog
+* Sat Feb  9 2013 Volker Fröhlich <volker27 at gmx.at> - 2.0.4-5
+- Dispensable version of COPYING is no more
+- Correct path to traceroute in DB dumps again
+
 * Tue Jan 22 2013 Volker Fröhlich <volker27 at gmx.at> - 2.0.4-4
 - Remove zabbix_get plus manpage from the proxy files section
 - Solve conflict for externalscripts symlink between proxy and


More information about the scm-commits mailing list