packages: nagios/nagios-apache.conf, nagios/nagios-lighttpd.conf, nagios/na...

[glen]

Author: glen                         Date: Wed Mar 10 20:01:28 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- move docs to standalone -doc package

---- Files affected:
packages/nagios:
   nagios-apache.conf (1.9 -> 1.10) , nagios-lighttpd.conf (1.7 -> 1.8) , nagios.spec (1.150 -> 1.151) 

---- Diffs:

================================================================
Index: packages/nagios/nagios-apache.conf
diff -u packages/nagios/nagios-apache.conf:1.9 packages/nagios/nagios-apache.conf:1.10
--- packages/nagios/nagios-apache.conf:1.9	Wed Mar 10 20:06:02 2010
+++ packages/nagios/nagios-apache.conf	Wed Mar 10 21:01:19 2010
@@ -6,6 +6,9 @@
 <Directory /usr/share/nagios>
 	Allow from all
 </Directory>
+<Directory /usr/share/doc/nagios>
+	Allow from all
+</Directory>
 
 <Directory /usr/lib/nagios/cgi>
 	Options ExecCGI
@@ -31,4 +34,5 @@
 </Directory>
 
 ScriptAlias /nagios/cgi-bin/ /usr/lib/nagios/cgi/
+Alias /nagios/docs/ /usr/share/doc/nagios/
 Alias /nagios/ /usr/share/nagios/

================================================================
Index: packages/nagios/nagios-lighttpd.conf
diff -u packages/nagios/nagios-lighttpd.conf:1.7 packages/nagios/nagios-lighttpd.conf:1.8
--- packages/nagios/nagios-lighttpd.conf:1.7	Sun Oct  5 05:43:01 2008
+++ packages/nagios/nagios-lighttpd.conf	Wed Mar 10 21:01:19 2010
@@ -4,7 +4,8 @@
 
 alias.url += (
 	"/nagios/cgi-bin/" => "/usr/lib/nagios/cgi/",
-	"/nagios" => "/usr/share/nagios",
+	"/nagios/docs/" => "/usr/share/doc/nagios/",
+	"/nagios/" => "/usr/share/nagios/",
 )
 
 $HTTP["url"] =~ "^/nagios/" {

================================================================
Index: packages/nagios/nagios.spec
diff -u packages/nagios/nagios.spec:1.150 packages/nagios/nagios.spec:1.151
--- packages/nagios/nagios.spec:1.150	Wed Mar 10 20:54:16 2010
+++ packages/nagios/nagios.spec	Wed Mar 10 21:01:19 2010
@@ -14,7 +14,7 @@
 License:	GPL v2
 Group:		Networking
 Source0:	http://downloads.sourceforge.net/nagios/%{name}-%{version}.tar.gz
-# Source0-md5:	3566167cc60ddeaad34e7d2e26ed4a58
+# Source0-md5:	d4655ee8c95c9679fd4fd53dac34bbe3
 Source1:	%{name}-apache.conf
 Source2:	%{name}.init
 Source3:	%{name}.sysconfig
@@ -126,7 +126,7 @@
 Summary:	CGI webinterface for Nagios
 Summary(pl.UTF-8):	Interfejs WWW/CGI dla Nagiosa
 Group:		Applications/WWW
-# for dirs... and accessing local logs.
+# for dirs... and accessing local logs, nagios config
 Requires:	%{name} = %{version}-%{release}
 Requires:	%{name}-imagepaks
 Requires:	%{name}-theme
@@ -138,6 +138,7 @@
 Requires:	webserver(auth)
 Requires:	webserver(cgi)
 Requires:	webserver(indexfile)
+Suggests:	%{name}-doc
 
 %description cgi
 CGI webinterface for Nagios.
@@ -145,6 +146,14 @@
 %description cgi -l pl.UTF-8
 Interfejs CGI dla Nagiosa.
 
+%package doc
+Summary:	HTML Documentation for Nagios
+Group:		Documentation
+# does not require base
+
+%description doc
+HTML Documentation for Nagios.
+
 %package theme-default
 Summary:	Default Nagios theme
 Summary(pl.UTF-8):	Domyślny motyw Nagiosa
@@ -286,6 +295,9 @@
 done
 > $RPM_BUILD_ROOT%{_localstatedir}/rw/nagios.cmd
 
+install -d $RPM_BUILD_ROOT%{_docdir}/%{name}
+mv $RPM_BUILD_ROOT{%{_datadir}/docs/*,%{_docdir}/%{name}}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -423,6 +435,10 @@
 %dir %{_prefix}/lib/%{name}/eventhandlers
 %endif
 
+%files doc
+%defattr(644,root,root,755)
+%{_docdir}/%{name}
+
 %files cgi
 %defattr(644,root,root,755)
 %dir %attr(750,root,http) %{_webapps}/%{_webapp}
@@ -441,7 +457,6 @@
 %dir %{_datadir}/stylesheets
 %{_datadir}/robots.txt
 %{_datadir}/contexthelp
-%{_datadir}/docs
 %{_datadir}/media
 %{_datadir}/ssi
 %{_datadir}/images/favicon.ico
@@ -469,6 +484,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.151  2010/03/10 20:01:19  glen
+- move docs to standalone -doc package
+
 Revision 1.150  2010/03/10 19:54:16  glen
 - suggest some basic plugins in main package
 - make main nagios.cfg readable for webserver
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nagios/nagios-apache.conf?r1=1.9&r2=1.10&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nagios/nagios-lighttpd.conf?r1=1.7&r2=1.8&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nagios/nagios.spec?r1=1.150&r2=1.151&f=u