Author: glen Date: Wed Mar 3 10:32:24 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- add ri subpackage
- regenerate ri/rdoc
---- Files affected:
packages/flashpolicyd:
flashpolicyd.spec (1.7 -> 1.8)
---- Diffs:
================================================================
Index: packages/flashpolicyd/flashpolicyd.spec
diff -u packages/flashpolicyd/flashpolicyd.spec:1.7
packages/flashpolicyd/flashpolicyd.spec:1.8
--- packages/flashpolicyd/flashpolicyd.spec:1.7 Wed Mar 3 11:21:56 2010
+++ packages/flashpolicyd/flashpolicyd.spec Wed Mar 3 11:32:18 2010
@@ -32,6 +32,18 @@
%description rdoc
Documentation files for flashpolicyd.
+%package ri
+Summary: ri documentation for flashpolicyd
+Summary(pl.UTF-8): Dokumentacja w formacie ri dla flashpolicyd
+Group: Documentation
+Requires: ruby
+
+%description ri
+ri documentation for flashpolicyd.
+
+%description ri -l pl.UTF-8
+Dokumentacji w formacie ri dla flashpolicyd.
+
%package -n nagios-plugin-%{plugin}
Summary: Nagios plugin to check flashpolicyd
Group: Networking
@@ -43,8 +55,8 @@
%prep
%setup -q
%patch0 -p1
-mv doc rdoc
-rm rdoc/created.rid
+# we regenerate rdoc our own
+rm -rf doc
cat > nagios.cfg <<'EOF'
# Usage:
@@ -67,6 +79,11 @@
}
EOF
+%build
+rdoc --ri --op ri --title 'Flash Policy Daemon version %{version}'
flashpolicyd.rb check_flashpolicyd.rb
+rdoc --op rdoc --title 'Flash Policy Daemon version %{version}'
flashpolicyd.rb check_flashpolicyd.rb
+rm ri/created.rid
+
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT{/etc/{sysconfig,rc.d/init.d},%{_sbindir}}
@@ -74,9 +91,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}
+# rdoc/ri
+install -d $RPM_BUILD_ROOT{%{ruby_ridir},%{ruby_rdocdir}}
cp -a rdoc $RPM_BUILD_ROOT%{ruby_rdocdir}/%{name}-%{version}
+cp -a ri/* $RPM_BUILD_ROOT%{ruby_ridir}
install -d $RPM_BUILD_ROOT{%{pluginconf},%{plugindir}}
cp -a nagios.cfg $RPM_BUILD_ROOT%{pluginconf}/%{plugin}.cfg
@@ -106,6 +124,10 @@
%defattr(644,root,root,755)
%{ruby_rdocdir}/%{name}-%{version}
+%files ri
+%defattr(644,root,root,755)
+%{ruby_ridir}/PolicyServer
+
%files -n nagios-plugin-%{plugin}
%defattr(644,root,root,755)
%attr(640,root,nagios) %config(noreplace) %verify(not md5 mtime size)
%{pluginconf}/%{plugin}.cfg
@@ -117,6 +139,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.8 2010/03/03 10:32:18 glen
+- add ri subpackage
+- regenerate ri/rdoc
+
Revision 1.7 2010/03/03 10:21:56 glen
- add rdoc subpackage
- add service template in nagios plugin
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/flashpolicyd/flashpolicyd.spec?r1=1.7&r2=1.8&f=u
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
