- move docs to standalone -doc package

Changed files:
    nagios-apache.conf -> 1.10
    nagios-lighttpd.conf -> 1.8
    nagios.spec -> 1.151

diff --git a/nagios-apache.conf b/nagios-apache.conf
index 07ea15fcdec88ffa82765e1e3b102a424ec28007..5c5de347030c8f69555beb5cf191e3bd7d8b4ce9 100644 (file)
--- a/nagios-apache.conf
+++ b/nagios-apache.conf
@@ -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/

diff --git a/nagios-lighttpd.conf b/nagios-lighttpd.conf
index eb94ca1d20b0e70e4f441ff3e4957b99abf1db2a..f4f373aa47962393cee4a7172e843d09f20ee2bd 100644 (file)
--- a/nagios-lighttpd.conf
+++ b/nagios-lighttpd.conf
@@ -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/" {

diff --git a/nagios.spec b/nagios.spec
index f99b2d7005438fa4bfc03fbe9c1f432720645008..c26c222c40cf52fad79cdd2aee7ed174ce97a98c 100644 (file)
--- a/nagios.spec
+++ b/nagios.spec
@@ -13,7 +13,7 @@ Release:      1
 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
@@ -125,7 +125,7 @@ Wspólne pliki wymagane zarówno przez nagiosa jak i nrpe.
 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
@@ -137,6 +137,7 @@ Requires:   webserver(alias)
 Requires:      webserver(auth)
 Requires:      webserver(cgi)
 Requires:      webserver(indexfile)
+Suggests:      %{name}-doc
 
 %description cgi
 CGI webinterface for Nagios.
@@ -144,6 +145,14 @@ CGI webinterface for Nagios.
 %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
@@ -285,6 +294,9 @@ for i in {objects.{cache,precache},{comments,downtime,retention,status}.dat,nagi
 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
 
@@ -422,6 +434,10 @@ done
 %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}
@@ -440,7 +456,6 @@ done
 %dir %{_datadir}/stylesheets
 %{_datadir}/robots.txt
 %{_datadir}/contexthelp
-%{_datadir}/docs
 %{_datadir}/media
 %{_datadir}/ssi
 %{_datadir}/images/favicon.ico