packages: nagios-plugin-check_multi/nagios-plugin-check_multi.spec - fix fe...

glen glen at pld-linux.org
Mon Jun 25 21:02:15 CEST 2012


Author: glen                         Date: Mon Jun 25 19:02:15 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix few paths, package empty dirs

---- Files affected:
packages/nagios-plugin-check_multi:
   nagios-plugin-check_multi.spec (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/nagios-plugin-check_multi/nagios-plugin-check_multi.spec
diff -u packages/nagios-plugin-check_multi/nagios-plugin-check_multi.spec:1.1 packages/nagios-plugin-check_multi/nagios-plugin-check_multi.spec:1.2
--- packages/nagios-plugin-check_multi/nagios-plugin-check_multi.spec:1.1	Mon Jun 25 20:47:54 2012
+++ packages/nagios-plugin-check_multi/nagios-plugin-check_multi.spec	Mon Jun 25 21:02:10 2012
@@ -8,7 +8,7 @@
 Summary:	Multi purpose wrapper plugin for Nagios/Icinga
 Name:		nagios-plugin-%{plugin}
 Version:	0.26
-Release:	0.2
+Release:	0.9
 License:	GPL v2
 Group:		Networking
 URL:		http://my-plugin.de/wiki/projects/check_multi/start
@@ -19,8 +19,8 @@
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_sysconfdir	/etc/nagios/plugins
-%define		plugindir	%{_prefix}/lib/nagios/plugins
+%define		_sysconfdir		/etc/nagios/plugins
+%define		plugindir		%{_prefix}/lib/nagios/plugins
 
 %description
 check_multi is a multi purpose wrapper plugin which takes benefit of
@@ -41,13 +41,22 @@
 %prep
 %setup -q -n %{plugin}-%{version}
 
+%{__sed} -i -e '
+	s, at sysconfdir@/send_nsca.cfg,/etc/nagios/send_nsca.cfg,
+' plugins/check_multi.in
+
 %build
 ETHTOOL=/sbin/ethtool \
 GUNZIP=/usr/bin/gunzip \
 MAILX=/bin/mailx \
 %configure \
-	--prefix=%{plugindir} \
-	--libexecdir=%{plugindir}
+	--libexecdir=%{plugindir} \
+	--with-plugin_path=%{plugindir} \
+	--with-checkresults_dir=/var/spool/nagios/checkresults \
+	--with-livestatus=/var/lib/nagios/rw/live \
+	--with-objects_cache=/var/lib/nagios/objects.cache \
+	--with-status_dat=/var/lib/nagios/status.dat \
+	%{nil}
 
 %if %{with tests}
 %{__make} test
@@ -59,7 +68,7 @@
 	-C plugins \
 	DESTDIR=$RPM_BUILD_ROOT
 
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/%{plugin}
+install -d $RPM_BUILD_ROOT%{_sysconfdir}/%{plugin}/{cluster,feed_passive}
 %{__make} install-config \
 	CFGDIR=%{_examplesdir}/%{name}-%{version} \
 	DESTDIR=$RPM_BUILD_ROOT
@@ -92,6 +101,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.2  2012/06/25 19:02:10  glen
+- fix few paths, package empty dirs
+
 Revision 1.1  2012/06/25 18:47:54  glen
 - initial, based on src.rpm found from opensuse:
   http://download.opensuse.org/repositories/home:/uebelhacker/openSUSE_Factory/src/check_multi-0.26-1.3.src.rpm
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/nagios-plugin-check_multi/nagios-plugin-check_multi.spec?r1=1.1&r2=1.2



More information about the pld-cvs-commit mailing list