[packages/nagios-plugins] fix check_file_age utils.pm locate

glen glen at pld-linux.org
Fri Oct 2 13:42:41 CEST 2015


commit fdf55e5947bce35698acd860cdb8ba8399ed4401
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Fri Oct 2 14:42:19 2015 +0300

    fix check_file_age utils.pm locate

 nagios-plugins.spec |  4 +++-
 use-lib.patch       | 12 ++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)
---
diff --git a/nagios-plugins.spec b/nagios-plugins.spec
index 22a1766..d888434 100644
--- a/nagios-plugins.spec
+++ b/nagios-plugins.spec
@@ -16,7 +16,7 @@ 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.1.1
-Release:	2
+Release:	3
 License:	GPL v3
 Group:		Networking
 Source0:	http://www.nagios-plugins.org/download/%{name}-%{version}.tar.gz
@@ -36,6 +36,7 @@ Patch21:	%{name}-check_hpjd-no-paper-out.patch
 Patch23:	%{name}-check_disk_smb-zero-cap.patch
 Patch24:	%{name}-paths.patch
 Patch27:	%{name}-ping.patch
+Patch28:	use-lib.patch
 URL:		http://www.nagiosplugins.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -516,6 +517,7 @@ mv nagios-plugins-config-*/* .
 %patch23 -p1
 %patch24 -p1
 %patch27 -p1
+%patch28 -p1
 
 # remove libtool m4 macro copies, breaks when system libtool is older
 %{__rm} gl/m4/libtool.m4 gl/m4/lt*.m4
diff --git a/use-lib.patch b/use-lib.patch
new file mode 100644
index 0000000..28c13eb
--- /dev/null
+++ b/use-lib.patch
@@ -0,0 +1,12 @@
+--- nagios-plugins-2.1.1/plugins-scripts/check_file_age.pl~	2015-08-05 22:45:01.000000000 +0300
++++ nagios-plugins-2.1.1/plugins-scripts/check_file_age.pl	2015-10-02 13:47:44.633618522 +0300
+@@ -26,7 +26,8 @@
+ use Getopt::Long;
+ use File::stat;
+ use vars qw($PROGNAME);
+-use lib ".";
++use FindBin;
++use lib "$FindBin::Bin";
+ use utils qw (%ERRORS &print_revision &support);
+ 
+ sub print_help ();
================================================================

---- gitweb:

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



More information about the pld-cvs-commit mailing list