Author: glen Date: Wed Mar 3 10:22:01 2010 GMT Module: packages Tag: HEAD ---- Log message: - add rdoc subpackage - add service template in nagios plugin - rel 3
---- Files affected: packages/flashpolicyd: flashpolicyd.spec (1.6 -> 1.7) ---- Diffs: ================================================================ Index: packages/flashpolicyd/flashpolicyd.spec diff -u packages/flashpolicyd/flashpolicyd.spec:1.6 packages/flashpolicyd/flashpolicyd.spec:1.7 --- packages/flashpolicyd/flashpolicyd.spec:1.6 Wed Feb 10 17:15:39 2010 +++ packages/flashpolicyd/flashpolicyd.spec Wed Mar 3 11:21:56 2010 @@ -3,7 +3,7 @@ Summary: Daemon to serve Adobe Flash socket policy XML Name: flashpolicyd Version: 2.1 -Release: 2 +Release: 3 License: GPL v2 Group: Networking/Daemons URL: http://code.google.com/p/flashpolicyd/ @@ -24,6 +24,14 @@ %description Daemon to serve Adobe Flash socket policy XML. +%package rdoc +Summary: Documentation files for flashpolicyd +Group: Documentation +Requires: ruby >= 1:1.8.7-4 + +%description rdoc +Documentation files for flashpolicyd. + %package -n nagios-plugin-%{plugin} Summary: Nagios plugin to check flashpolicyd Group: Networking @@ -36,6 +44,7 @@ %setup -q %patch0 -p1 mv doc rdoc +rm rdoc/created.rid cat > nagios.cfg <<'EOF' # Usage: @@ -44,6 +53,18 @@ command_name %{plugin} command_line %{plugindir}/%{plugin} --host $HOSTADDRESS$ $ARG1$ } + +define service { + use generic-service + name flashpolicyd + service_description flashpolicyd + register 0 + + normal_check_interval 5 + retry_check_interval 1 + + check_command check_flashpolicyd +} EOF %install @@ -53,6 +74,10 @@ install -p flashpolicyd.rb $RPM_BUILD_ROOT%{_sbindir}/flashpolicyd cp -a flashpolicy.xml $RPM_BUILD_ROOT%{_sysconfdir}/flashpolicy.xml +# rdoc +install -d $RPM_BUILD_ROOT%{ruby_rdocdir} +cp -a rdoc $RPM_BUILD_ROOT%{ruby_rdocdir}/%{name}-%{version} + install -d $RPM_BUILD_ROOT{%{pluginconf},%{plugindir}} cp -a nagios.cfg $RPM_BUILD_ROOT%{pluginconf}/%{plugin}.cfg install -p %{plugin}.rb $RPM_BUILD_ROOT%{plugindir}/%{plugin} @@ -72,11 +97,15 @@ %files %defattr(644,root,root,755) -%doc README rdoc +%doc README %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/flashpolicy.xml %attr(754,root,root) /etc/rc.d/init.d/flashpolicyd %attr(755,root,root) %{_sbindir}/flashpolicyd +%files rdoc +%defattr(644,root,root,755) +%{ruby_rdocdir}/%{name}-%{version} + %files -n nagios-plugin-%{plugin} %defattr(644,root,root,755) %attr(640,root,nagios) %config(noreplace) %verify(not md5 mtime size) %{pluginconf}/%{plugin}.cfg @@ -88,6 +117,11 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.7 2010/03/03 10:21:56 glen +- add rdoc subpackage +- add service template in nagios plugin +- rel 3 + Revision 1.6 2010/02/10 16:15:39 glen - ruby-modules for socket.rb; rel 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/flashpolicyd/flashpolicyd.spec?r1=1.6&r2=1.7&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
