packages: nagios-plugin-check_poldek/nagios-plugin-check_poldek.spec - fetc...

[pawelz]

Author: pawelz                       Date: Tue May 11 13:57:19 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fetch poldek indices in %post
- defined %cachedir macro for /var/cache/check_poldek
- sorted deps

---- Files affected:
packages/nagios-plugin-check_poldek:
   nagios-plugin-check_poldek.spec (1.10 -> 1.11) 

---- 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.10 packages/nagios-plugin-check_poldek/nagios-plugin-check_poldek.spec:1.11
--- packages/nagios-plugin-check_poldek/nagios-plugin-check_poldek.spec:1.10	Tue May 11 15:21:33 2010
+++ packages/nagios-plugin-check_poldek/nagios-plugin-check_poldek.spec	Tue May 11 15:57:14 2010
@@ -11,16 +11,17 @@
 # Source0-md5:	f3efc8d83b8022945657ea583645e820
 URL:		http://github.com/pawelz/nagios-check_poldek
 BuildRequires:	rpmbuild(macros) >= 1.552
-Requires:	nagios-common
-Requires:	python-modules
 Requires:	grep
+Requires:	nagios-common
 Requires:	poldek
+Requires:	python-modules
 Requires:	sed
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_sysconfdir	/etc/nagios/plugins
 %define		plugindir	%{_prefix}/lib/nagios/plugins
+%define		cachedir	/var/cache/check_poldek
 
 %description
 Nagios plugin to check updates of poldek based systems.
@@ -37,13 +38,13 @@
 # %{plugin}
 define command {
 	command_name    %{plugin}
-	command_line    %{plugindir}/%{plugin} --cache /var/cache/check_poldek -c $ARG1$ -w $ARG2$
+	command_line    %{plugindir}/%{plugin} --cache %{cachedir} -c $ARG1$ -w $ARG2$
 }
 EOF
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{plugindir},/var/cache/check_poldek}
+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
 
@@ -56,11 +57,14 @@
 %triggerun -- nagios-nrpe
 %nagios_nrpe -d %{plugin} -f %{_sysconfdir}/%{plugin}.cfg
 
+%post
+poldek --cache %{cachedir} -q --up
+
 %files
 %defattr(644,root,root,755)
 %attr(640,root,nagios) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{plugin}.cfg
 %attr(755,root,root) %{plugindir}/%{plugin}
-%dir %attr(775,root,nagios) /var/cache/check_poldek
+%dir %attr(775,root,nagios) %{cachedir}
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -68,6 +72,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.11  2010/05/11 13:57:14  pawelz
+- fetch poldek indices in %post
+- defined %cachedir macro for /var/cache/check_poldek
+- sorted deps
+
 Revision 1.10  2010/05/11 13:21:33  pawelz
 - of course it requires poldek
 
================================================================

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