packages: nagios-plugins/nagios-plugins.spec - adjust lib64 paths for plugi...

[glen]

Author: glen                         Date: Mon Sep  7 15:22:23 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- adjust lib64 paths for plugins
- nagios-plugin-check_mailq (separated from -perl)

---- Files affected:
packages/nagios-plugins:
   nagios-plugins.spec (1.110 -> 1.111) 

---- Diffs:

================================================================
Index: packages/nagios-plugins/nagios-plugins.spec
diff -u packages/nagios-plugins/nagios-plugins.spec:1.110 packages/nagios-plugins/nagios-plugins.spec:1.111
--- packages/nagios-plugins/nagios-plugins.spec:1.110	Fri Sep  4 18:53:25 2009
+++ packages/nagios-plugins/nagios-plugins.spec	Mon Sep  7 17:22:17 2009
@@ -160,6 +160,16 @@
 %description -n nagios-plugin-check_sensors -l pl.UTF-8
 Ta wtyczka sprawdza stan sprzętu przy użyciu pakietu lm_sensors.
 
+%package -n nagios-plugin-check_mailq
+Summary:	Nagios plugin to check the number of messages in the local mail queue
+Group:		Networking
+# for utils.pm
+Requires:	%{name}-libs = %{version}-%{release}
+
+%description -n nagios-plugin-check_mailq
+Checks the number of messages in the mail queue (supports multiple
+sendmail queues, qmail).
+
 %package mysql
 Summary:	Nagios plugin to test a MySQL DBMS
 Summary(pl.UTF-8):	Wtyczka Nagiosa do sprawdzania systemu baz danych MySQL
@@ -598,9 +608,6 @@
 cp -a gl/*.h $RPM_BUILD_ROOT%{_includedir}/nagiosplug/gl
 cp -a lib/*.h $RPM_BUILD_ROOT%{_includedir}/nagiosplug/lib
 
-install -d $RPM_BUILD_ROOT%{_sysconfdir}
-cp -a commands/*.cfg $RPM_BUILD_ROOT%{_sysconfdir}
-
 %find_lang %{name}
 
 # all files with exec permissions are plugins.
@@ -625,6 +632,14 @@
 %{__sed} -i -e 's,use lib "%{_pluginarchdir}",use lib "%{_pluginlibdir}",' $RPM_BUILD_ROOT%{_pluginlibdir}/check_*
 %endif
 
+install -d $RPM_BUILD_ROOT%{_sysconfdir}
+for file in commands/*.cfg; do
+	cfg=${file##*/}
+	plugin=${cfg%.cfg}
+	[ -x $RPM_BUILD_ROOT%{_pluginarchdir}/$plugin ] && libdir=%{_pluginarchdir} || libdir=%{_pluginlibdir}
+	sed -e "s,\\\$USER1\\\$,$libdir," $file > $RPM_BUILD_ROOT%{_sysconfdir}/$cfg
+done
+
 cp -a %{SOURCE2} $RPM_BUILD_ROOT%{_pluginlibdir}/utils.php
 cp -a contrib/utils.py $RPM_BUILD_ROOT%{_pluginlibdir}
 chmod a-x $RPM_BUILD_ROOT%{_pluginlibdir}/utils.*
@@ -738,7 +753,6 @@
 %attr(755,root,root) %{_pluginlibdir}/check_file_age
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/check_ircd.cfg
 %attr(755,root,root) %{_pluginlibdir}/check_ircd
-%attr(755,root,root) %{_pluginlibdir}/check_mailq
 %attr(755,root,root) %{_pluginlibdir}/check_rpc
 
 # requires license.dat
@@ -764,6 +778,10 @@
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_pluginlibdir}/check_sensors
 
+%files -n nagios-plugin-check_mailq
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_pluginlibdir}/check_mailq
+
 %files mysql
 %defattr(644,root,root,755)
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/check_mysql.cfg
@@ -902,6 +920,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.111  2009/09/07 15:22:17  glen
+- adjust lib64 paths for plugins
+- nagios-plugin-check_mailq (separated from -perl)
+
 Revision 1.110  2009/09/04 16:53:25  glen
 - check_spamd has own package
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nagios-plugins/nagios-plugins.spec?r1=1.110&r2=1.111&f=u