X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=nagios.spec;h=fba3e60112693885482a8c99cb1f0e59a15d9000;hb=88158dc8b9ad21209d6fae35cd585b9d05798918;hp=27262149afa73cd460e0e039891c65bad77fd5a9;hpb=a02dfee581c1cfcb74bf5837325a3e8670ac24a9;p=packages%2Fnagios.git

diff --git a/nagios.spec b/nagios.spec
index 2726214..fba3e60 100644
--- a/nagios.spec
+++ b/nagios.spec
@@ -1,3 +1,4 @@
+#
 # Conditional build:
 %bcond_without	gd	# without statusmap and trends, which require gd library
 #
@@ -5,12 +6,12 @@ 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
+Version:	2.10
 Release:	1
 License:	GPL v2
 Group:		Networking
 Source0:	http://dl.sourceforge.net/nagios/%{name}-%{version}.tar.gz
-# Source0-md5:	d664d2785cdca3c5c8a3e84c033e8e6e
+# Source0-md5:	8c3a29e138f2ff8c8abbd3dd8a40c4b6
 Source1:	%{name}-apache.conf
 Source2:	%{name}.init
 Source3:	%{name}.sysconfig
@@ -123,6 +124,7 @@ Requires:	%{name}-theme
 Requires:	group(http)
 Requires:	webapps
 Requires:	webserver
+Requires:	webserver(access)
 Requires:	webserver(alias)
 Requires:	webserver(auth)
 Requires:	webserver(cgi)
@@ -200,10 +202,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 +236,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
@@ -438,6 +446,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}