[packages/nagios-plugin-check_raid: 4/4] Merge branch 'DEVEL'

[glen]

commit cdda5f8a325f8dbd23134a6612a42c11405fe085
Merge: c04d004 c49666e
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Thu Sep 11 18:21:42 2014 +0300

    Merge branch 'DEVEL'
    
    Conflicts:
    	nagios-plugin-check_raid.spec

 nagios-plugin-check_raid.spec | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)
---
diff --cc nagios-plugin-check_raid.spec
index 5484a21,9898def..0024944
--- a/nagios-plugin-check_raid.spec
+++ b/nagios-plugin-check_raid.spec
@@@ -3,18 -3,15 +3,18 @@@
  %define		plugin	check_raid
  Summary:	Nagios plugin to check current server's RAID status
  Name:		nagios-plugin-%{plugin}
- Version:	2.2.50
- Release:	3
+ Version:	3.1.0
+ Release:	1
  License:	GPL v2
  Group:		Networking
- Source0:	https://github.com/glensc/nagios-plugin-check_raid/tarball/%{version}/%{plugin}-%{version}.tgz
- # Source0-md5:	7512ae0de0e62681f8b62550555c6429
+ Source0:	https://github.com/glensc/nagios-plugin-check_raid/archive/%{version}/%{plugin}-%{version}.tar.gz
+ # Source0-md5:	51e1bdabc9642b68a53ac2ca5b9961c4
  URL:		https://github.com/glensc/nagios-plugin-check_raid
 +BuildRequires:	rpmbuild(macros) >= 1.685
 +Requires:	grep
  Requires:	nagios-common
  Requires:	perl-base >= 1:5.8.0
 +Requires:	sed >= 4.0
  Requires:	sudo
  Suggests:	CmdTool2
  Suggests:	arcconf
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/nagios-plugin-check_raid.git/commitdiff/cdda5f8a325f8dbd23134a6612a42c11405fe085