- release 2

[packages/nagios.git] / nagios.spec

diff --git a/nagios.spec b/nagios.spec
index 27262149afa73cd460e0e039891c65bad77fd5a9..cb7b37f27ea51cc27c00e3c4ee588afb34d1780d 100644 (file)
--- a/nagios.spec
+++ b/nagios.spec
@@ -1,3 +1,4 @@
+#
 # Conditional build:
 %bcond_without gd      # without statusmap and trends, which require gd library
 #
@@ -5,24 +6,23 @@ Summary:      Host/service/network monitoring program
 Summary(pl.UTF-8):     Program do monitorowania serwerów/usług/sieci
 Summary(pt_BR.UTF-8):  Programa para monitoração de máquinas e serviços
 Name:          nagios
-Version:       2.7
-Release:       1
+Version:       3.0.1
+Release:       2
 License:       GPL v2
 Group:         Networking
 Source0:       http://dl.sourceforge.net/nagios/%{name}-%{version}.tar.gz
-# Source0-md5: d664d2785cdca3c5c8a3e84c033e8e6e
+# Source0-md5: 4c3b353bfa94b49a616924cf3f910734
 Source1:       %{name}-apache.conf
 Source2:       %{name}.init
 Source3:       %{name}.sysconfig
 Source4:       http://www.nagios.org/images/favicon.ico
 # Source4-md5: 1c4201c7da53d6c7e48251d3a9680449
-Source5:       %{name}-config-20050514.tar.bz2
-# Source5-md5: a2883c65377ef7beb55d48af85ec7ef7
+Source5:       %{name}-config-20071217.tar.bz2
+# Source5-md5: c50e60b73f86b8bfbc36f486d583f67b
 Source6:       %{name}-lighttpd.conf
 Patch0:                %{name}-resources.patch
 Patch1:                %{name}-iconv-in-libc.patch
-Patch2:                %{name}-favicon.patch
-Patch3:                %{name}-webapps.patch
+Patch2:                %{name}-webapps.patch
 URL:           http://www.nagios.org/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -38,7 +38,6 @@ Requires(post,preun): /sbin/chkconfig
 Requires(triggerpostun):       sed >= 4.0
 Requires:      %{name}-common = %{version}-%{release}
 Requires:      /bin/mail
-Requires:      nagios-plugins
 Requires:      rc-scripts
 Requires:      sh-utils
 Provides:      nagios-core
@@ -123,6 +122,7 @@ Requires:   %{name}-theme
 Requires:      group(http)
 Requires:      webapps
 Requires:      webserver
+Requires:      webserver(access)
 Requires:      webserver(alias)
 Requires:      webserver(auth)
 Requires:      webserver(cgi)
@@ -172,7 +172,6 @@ aplicativos para o Nagios.
 %patch0 -p0
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 
 sed -i -e '
        s,".*/var/rw/nagios.cmd,"%{_localstatedir}/rw/nagios.cmd,
@@ -200,10 +199,15 @@ cp -f /usr/share/automake/config.sub .
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{/etc/{sysconfig,rc.d/init.d},%{_includedir}/%{name},%{_libdir}/%{name}/{eventhandlers,plugins}} \
-       $RPM_BUILD_ROOT{%{_var}/log/%{name}/archives,%{_localstatedir}/rw,%{_sysconfdir}/{plugins,local},%{_examplesdir}/%{name}-%{version}} \
-       $RPM_BUILD_ROOT%{_webapps}/%{_webapp}
+install -d $RPM_BUILD_ROOT{/etc/{sysconfig,rc.d/init.d},%{_webapps}/%{_webapp}} \
+       $RPM_BUILD_ROOT{%{_var}/log/%{name}/archives,%{_localstatedir}/rw} \
+       $RPM_BUILD_ROOT%{_sysconfdir}/{plugins,local} \
+       $RPM_BUILD_ROOT%{_libdir}/%{name}/{eventhandlers,plugins} \
+%if "%{_lib}" != "lib"
+       $RPM_BUILD_ROOT%{_prefix}/lib/%{name}/{eventhandlers,plugins} \
+%endif
 
+install -d $RPM_BUILD_ROOT%{_includedir}/%{name}
 install include/*.h    $RPM_BUILD_ROOT%{_includedir}/%{name}
 
 %{__make} install-unstripped \
@@ -229,6 +233,7 @@ mv $RPM_BUILD_ROOT{%{_sysconfdir}/cgi.cfg,%{_webapps}/%{_webapp}}
 echo 'nagios:' > $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/group
 
 # install event handlers
+install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 cp -a contrib/eventhandlers $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
 # Object data/cache files
@@ -263,9 +268,9 @@ fi
 %groupadd -g 72 nagios
 %groupadd -g 147 -f nagios-data
 if [ -n "`id -u netsaint 2>/dev/null`" ] && [ "`id -u netsaint`" = "72" ]; then
-       /usr/sbin/usermod -d %{_libdir}/nagios -l nagios -c "Nagios User" -G nagios-data netsaint
+       /usr/sbin/usermod -d %{_libdir}/nagios -l nagios -c "Nagios Daemon" -G nagios-data netsaint
 fi
-%useradd -u 72 -d %{_libdir}/nagios -s /bin/false -c "Nagios User" -g nagios -G nagios-data nagios
+%useradd -u 72 -d %{_libdir}/nagios -s /bin/false -c "Nagios Daemon" -g nagios -G nagios-data nagios
 
 %postun common
 if [ "$1" = "0" ]; then
@@ -423,6 +428,8 @@ fi
 %attr(770,root,nagios-data) %dir %{_localstatedir}
 %attr(2770,root,nagios-data) %dir %{_localstatedir}/rw
 %attr(660,nagios,nagios-data) %ghost %{_localstatedir}/rw/nagios.cmd
+%attr(2770,root,nagios-data) %dir %{_localstatedir}/spool
+%attr(2770,root,nagios-data) %dir %{_localstatedir}/spool/checkresults
 %attr(664,root,nagios) %ghost %{_localstatedir}/objects.cache
 %attr(664,root,nagios) %ghost %{_localstatedir}/*.dat
 %attr(664,root,nagios) %ghost %{_localstatedir}/%{name}.tmp
@@ -438,6 +445,12 @@ fi
 %dir %{_libdir}/%{name}/plugins
 %dir %{_libdir}/%{name}/eventhandlers
 
+%if "%{_lib}" != "lib"
+%dir %{_prefix}/lib/%{name}
+%dir %{_prefix}/lib/%{name}/plugins
+%dir %{_prefix}/lib/%{name}/eventhandlers
+%endif
+
 %files cgi
 %defattr(644,root,root,755)
 %dir %attr(750,root,http) %{_webapps}/%{_webapp}