[packages/nagios-plugins: 4/7] Merge branch 'master' into unified-plugindir

[glen]

commit 350522814f2509f96c41df8b3b451ec6c2955984
Merge: 4094830 9394ee1
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Fri Feb 5 14:22:20 2016 +0200

    Merge branch 'master' into unified-plugindir
    
    Conflicts:
    	nagios-plugins.spec

 mawk-workaround.patch         | 172 ------------------------------------------
 nagios-plugins-cosmetic.patch |  11 ---
 nagios-plugins-subst.patch    |  29 -------
 nagios-plugins.spec           |  24 +++---
 syntax-error.patch            |  30 ++++++++
 use-lib.patch                 |  19 +++++
 6 files changed, 61 insertions(+), 224 deletions(-)
---
diff --cc nagios-plugins.spec
index 6b3f64d,9cf346a..0759730
--- a/nagios-plugins.spec
+++ b/nagios-plugins.spec
@@@ -15,8 -16,8 +16,8 @@@
  Summary:	Host/service/network monitoring program plugins for Nagios
  Summary(pl.UTF-8):	Wtyczki do monitorowania hostów/usług/sieci dla Nagiosa
  Name:		nagios-plugins
- Version:	2.0.3
- Release:	3.7
+ Version:	2.1.1
 -Release:	4
++Release:	4.1
  License:	GPL v3
  Group:		Networking
  Source0:	http://www.nagios-plugins.org/download/%{name}-%{version}.tar.gz
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/nagios-plugins.git/commitdiff/440b2c9273c23bb39b26f7f0121228c3c4bbdeb3