- add rdoc subpackage

- add service template in nagios plugin
- rel 3

Changed files:
    flashpolicyd.spec -> 1.7

diff --git a/flashpolicyd.spec b/flashpolicyd.spec
index b428c7e97bd1599d44df94c2455b01efc5d233e1..de517e13f404ffaeee2a8fcf987f2e1f32d0be6f 100644 (file)
--- a/flashpolicyd.spec
+++ b/flashpolicyd.spec
@@ -2,7 +2,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/
@@ -23,6 +23,14 @@ BuildRoot:   %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %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
@@ -35,6 +43,7 @@ Nagios plugin to check flashpolicyd.
 %setup -q
 %patch0 -p1
 mv doc rdoc
+rm rdoc/created.rid
 
 cat > nagios.cfg <<'EOF'
 # Usage:
@@ -43,6 +52,18 @@ define command {
        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
@@ -52,6 +73,10 @@ install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/flashpolicyd
 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}
@@ -71,11 +96,15 @@ fi
 
 %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