[nagios-plugins] Update to 2.0.1

[Sam Kottler]

commit e184b820ed00b22a2a55d8a2228e264f6aaa835f
Author: Sam Kottler <shk at linux.com>
Date:   Thu May 1 02:37:37 2014 -0400

    Update to 2.0.1

 .gitignore                                         |    1 +
 ...ific-fixes-for-searching-for-diff-and-tai.patch |   32 +++-------
 ...ugins-0010-fix-smart-attribute-comparison.patch |   64 --------------------
 nagios-plugins.spec                                |   24 ++++++--
 sources                                            |    2 +-
 5 files changed, 31 insertions(+), 92 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3c0f64b..2c24fdf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ nagios-plugins-1.4.15.tar.gz
 /nagios-plugins-1.4.15.tar.gz
 /nagios-plugins-1.4.16.tar.gz
 /nagios-plugins-1.5.tar.gz
+/nagios-plugins-2.0.1.tar.gz
diff --git a/nagios-plugins-0003-Fedora-specific-fixes-for-searching-for-diff-and-tai.patch b/nagios-plugins-0003-Fedora-specific-fixes-for-searching-for-diff-and-tai.patch
index e981268..cdf6fb3 100644
--- a/nagios-plugins-0003-Fedora-specific-fixes-for-searching-for-diff-and-tai.patch
+++ b/nagios-plugins-0003-Fedora-specific-fixes-for-searching-for-diff-and-tai.patch
@@ -1,27 +1,15 @@
-From 9daef71650a4999fc8d78773c32e9fafc73b3a5c Mon Sep 17 00:00:00 2001
-From: Peter Lemenkov <lemenkov at gmail.com>
-Date: Wed, 10 Mar 2010 12:10:16 +0300
-Subject: [PATCH 03/10] Fedora-specific fixes for searching for diff and tail
-
----
- plugins-scripts/check_log.sh | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/plugins-scripts/check_log.sh b/plugins-scripts/check_log.sh
-index a1bfb48..20fc2b2 100755
---- a/plugins-scripts/check_log.sh
-+++ b/plugins-scripts/check_log.sh
-@@ -62,8 +62,8 @@
+diff --git b/plugins-scripts/check_log.sh a/plugins-scripts/check_log.sh
+index ca5810a..7dba651 100755
+--- b/plugins-scripts/check_log.sh
++++ a/plugins-scripts/check_log.sh
+@@ -60,8 +60,8 @@
+ # TV: removed PATH restriction. Need to think more about what this means overall
+ #PATH=""
  
- ECHO="/bin/echo"
- GREP="/bin/egrep"
+-GREP="/bin/egrep"
 -DIFF="/bin/diff"
--TAIL="/bin/tail"
++GREP="/usr/bin/egrep"
 +DIFF="/usr/bin/diff"
-+TAIL="/usr/bin/tail"
+ TAIL="/bin/tail"
  CAT="/bin/cat"
  RM="/bin/rm"
- CHMOD="/bin/chmod"
--- 
-1.8.3.1
-
diff --git a/nagios-plugins.spec b/nagios-plugins.spec
index ec1a710..4f54077 100644
--- a/nagios-plugins.spec
+++ b/nagios-plugins.spec
@@ -1,8 +1,8 @@
 %global _hardened_build 1
 
 Name: nagios-plugins
-Version: 1.5
-Release: 2%{?dist}
+Version: 2.0.1
+Release: 1%{?dist}
 Summary: Host/service/network monitoring program plugins for Nagios
 
 Group: Applications/System
@@ -16,8 +16,6 @@ Patch4: nagios-plugins-0004-Fedora-specific-patch-for-not-to-fixing-fully-qualif
 # https://bugzilla.redhat.com/512559
 Patch5: nagios-plugins-0005-Prevent-check_swap-from-returning-OK-if-no-swap-acti.patch
 Patch7: nagios-plugins-0007-Fix-the-use-lib-statement-and-the-external-ntp-comma.patch
-# https://bugzilla.redhat.com/913085
-Patch10:nagios-plugins-0010-fix-smart-attribute-comparison.patch
 
 BuildRequires: openldap-devel
 BuildRequires: mysql-devel
@@ -520,6 +518,14 @@ Requires: nagios-plugins = %{version}-%{release}
 %description ups
 Provides check_ups support for Nagios.
 
+%package uptime
+Summary: Nagios Plugin - check_uptime
+Group: Applications/Systems
+Requires: nagios-plugins = %{version}-%{release}
+
+%description uptime
+Provides check_uptime support for Nagios.
+
 %package users
 Summary: Nagios Plugin - check_users
 Group: Applications/System
@@ -544,7 +550,6 @@ Provides check_wave support for Nagios.
 %patch4 -p1 -b .no_need_fo_fix_paths
 %patch5 -p1 -b .fix_missing_swap
 %patch7 -p1 -b .ext_ntp_cmds
-%patch10 -p1 -b .ssd_smart_params
 
 %build
 %configure \
@@ -778,6 +783,9 @@ chmod 644 %{buildroot}/%{_libdir}/nagios/plugins/utils.pm
 %files ups
 %{_libdir}/nagios/plugins/check_ups
 
+%files uptime
+%{_libdir}/nagios/plugins/check_uptime
+
 %files users
 %{_libdir}/nagios/plugins/check_users
 
@@ -785,6 +793,12 @@ chmod 644 %{buildroot}/%{_libdir}/nagios/plugins/utils.pm
 %{_libdir}/nagios/plugins/check_wave
 
 %changelog
+* Thu May 1 2014 Sam Kottler <skottler at fedoraproject.org> - 2.0.1-1
+- Update to 2.0.1
+- Moved SSD-specific patch which landed upstream
+- Update patch to binary paths in plugins-scripts/check_log.sh so it applies
+- Add -uptime subpackage
+
 * Thu Oct 24 2013 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.5-2
 - New check_dbi plugin (BR: libdbi-devel; subpackage: nagios-plugins-dbi)
 
diff --git a/sources b/sources
index ba15ca1..ba94155 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-730ac30df4a5e88fed8a766a2311d209  nagios-plugins-1.5.tar.gz
+70daeb6d2d9ea7d41827488b80782a60  nagios-plugins-2.0.1.tar.gz