From f1acb9f6a3cf42d8bcceb56987159166a913f365 Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Aug 27 2015 23:08:41 +0000
Subject: Merge remote-tracking branch 'origin/master' into el6


---

diff --git a/nagios-plugins.spec b/nagios-plugins.spec
index c319c2f..4d2170d 100644
--- a/nagios-plugins.spec
+++ b/nagios-plugins.spec
@@ -2,7 +2,7 @@
 
 Name: nagios-plugins
 Version: 2.0.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Host/service/network monitoring program plugins for Nagios
 
 Group: Applications/System
@@ -36,6 +36,8 @@ BuildRequires: libdbi-devel
 
 Requires: nagios-common >= 3.3.1-1
 
+Obsoletes: nagios-plugins-linux_raid < 1.4.16-11
+
 # nagios-plugins-1.4.16: the included gnulib files were last updated
 # in June/July 2010
 # Bundled gnulib exception (https://fedorahosted.org/fpc/ticket/174)
@@ -793,6 +795,10 @@ chmod 644 %{buildroot}/%{_libdir}/nagios/plugins/utils.pm
 %{_libdir}/nagios/plugins/check_wave
 
 %changelog
+* Thu Aug 27 2015 Kevin Fenzi <kevin@scrye.com> 2.0.3-2
+- Add obsoletes for nagios-plugin-linux_raid < 1.4.3-11
+- Fixes bug #1256682
+
 * Tue Aug 04 2015 Josh Boyer <jwboyer@fedoraproject.org> - 2.0.3-1
 - Update to 2.0.3