packages: nagios-plugin-check_poldek/nagios-plugin-check_poldek.spec, nagio...

[glen]

Author: glen                         Date: Wed Jan 11 14:53:28 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- use builtin cachedir, more transparent args to command

---- Files affected:
packages/nagios-plugin-check_poldek:
   nagios-plugin-check_poldek.spec (1.16 -> 1.17) , check_poldek.cfg (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/nagios-plugin-check_poldek/nagios-plugin-check_poldek.spec
diff -u packages/nagios-plugin-check_poldek/nagios-plugin-check_poldek.spec:1.16 packages/nagios-plugin-check_poldek/nagios-plugin-check_poldek.spec:1.17
--- packages/nagios-plugin-check_poldek/nagios-plugin-check_poldek.spec:1.16	Sat Feb  5 01:59:41 2011
+++ packages/nagios-plugin-check_poldek/nagios-plugin-check_poldek.spec	Wed Jan 11 15:53:22 2012
@@ -9,6 +9,7 @@
 Group:		Networking
 Source0:	http://github.com/pawelz/nagios-check_poldek/tarball/v%{version}/%{name}-%{version}.tar.gz
 # Source0-md5:	f1b67d7640f1c1558e6e99838b66a331
+Source1:	%{plugin}.cfg
 URL:		http://github.com/pawelz/nagios-check_poldek
 BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.552
@@ -34,20 +35,13 @@
 %setup -qc
 mv */* .
 
-cat > nagios.cfg <<'EOF'
-# Usage:
-# %{plugin}
-define command {
-	command_name    %{plugin}
-	command_line    %{plugindir}/%{plugin} --cache %{cachedir} -c $ARG1$ -w $ARG2$
-}
-EOF
+%{__sed} -i -e 's,/tmp/check_poldek,%{cachedir},' %{plugin}.py
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{plugindir},%{cachedir}}
 install -p %{plugin}.py $RPM_BUILD_ROOT%{plugindir}/%{plugin}
-cp -a nagios.cfg $RPM_BUILD_ROOT%{_sysconfdir}/%{plugin}.cfg
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/%{plugin}.cfg
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -70,6 +64,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.17  2012/01/11 14:53:22  glen
+- use builtin cachedir, more transparent args to command
+
 Revision 1.16  2011/02/05 00:59:41  sparky
 - corrected lang tag in Summary
 

================================================================
Index: packages/nagios-plugin-check_poldek/check_poldek.cfg
diff -u /dev/null packages/nagios-plugin-check_poldek/check_poldek.cfg:1.1
--- /dev/null	Wed Jan 11 15:53:28 2012
+++ packages/nagios-plugin-check_poldek/check_poldek.cfg	Wed Jan 11 15:53:22 2012
@@ -0,0 +1,6 @@
+# Usage:
+# check_poldek
+define command {
+	command_name    check_poldek
+	command_line    /usr/lib/nagios/plugins/check_poldek $ARG1$
+}
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nagios-plugin-check_poldek/nagios-plugin-check_poldek.spec?r1=1.16&r2=1.17&f=u