rpms/nagios/devel nagios.spec,1.71,1.72

[Robert M. Albrecht]

Author: romal

Update of /cvs/pkgs/rpms/nagios/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4561/devel

Modified Files:
	nagios.spec 
Log Message:
several fixes for specfile



Index: nagios.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nagios/devel/nagios.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- nagios.spec	15 Jul 2009 18:55:01 -0000	1.71
+++ nagios.spec	24 Jul 2009 17:41:04 -0000	1.72
@@ -1,7 +1,7 @@
 Name: nagios
 
 Version: 3.1.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Host/service/network monitoring program
 
 Group: Applications/System
@@ -22,7 +22,7 @@ BuildRequires: gd-devel > 1.8, mailx, li
 BuildRequires:  perl-devel
 BuildRequires:  perl(ExtUtils::Embed)
 
-#Requires: httpd
+Requires: httpd
 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Requires(pre): shadow-utils
 Requires(preun): initscripts, chkconfig
@@ -94,7 +94,7 @@ may compile against.
 	--libexecdir=%{_libdir}/%{name}/plugins \
 	--sysconfdir=%{_sysconfdir}/%{name} \
 	--localstatedir=%{_localstatedir}/log/%{name} \
-        --datadir=%{_datadir}/%{name}/html \
+	--datarootdir=%{_datadir}/%{name}/html \
 	--with-gd-lib=%{_libdir} \
 	--with-gd-inc=%{_includedir} \
 	--enable-embedded-perl \
@@ -191,6 +191,7 @@ fi
 %attr(0640,root,nagios) %config(noreplace) %{_sysconfdir}/%{name}/private/resource.cfg
 %attr(0640,root,nagios) %config(noreplace) %{_sysconfdir}/%{name}/conf.d/internet.cfg
 %attr(0640,root,apache) %config(noreplace) %{_sysconfdir}/%{name}/.htpasswd
+%attr(0640,root,apache) %config(noreplace) %{_datadir}/%{name}/html/config.inc.php
 %attr(0755,nagios,nagios) %dir %{_localstatedir}/spool/%{name}
 %attr(2775,nagios,nagios) %dir %{_localstatedir}/spool/%{name}/cmd
 %attr(0755,nagios,nagios) %dir %{_localstatedir}/log/%{name}
@@ -203,10 +204,18 @@ fi
 %{_includedir}/%{name}
 
 %changelog
-* Wed Jul 15 2009 Mike McGrath <mmcgrath at redhat.com> 3.2.1-2
+* Fri Jul 24 2009 Jose Pedro Oliveira <jpo at di.uminho.pt> - 3.1.2-3
+- Corrected the package version in the last two changelog entries (#499853)
+- Using configure --datarootdir option instead of --datadir (#499853)
+  (fixes the physical_html_path value in cgi.cfg)
+- Fixes permissions to the new php configuration file config.inc.php (#499853)
+- Re-enables the httpd requirement as its removal caused several problems
+  (see #487411 for more information)
+
+* Wed Jul 15 2009 Mike McGrath <mmcgrath at redhat.com> 3.1.2-2
 - Release bump for rebuild
 
-* Mon Jun 29 2009  Robert M. Albrecht <fedora at romal.de> 3.2.1-1
+* Mon Jun 29 2009  Robert M. Albrecht <fedora at romal.de> 3.1.1-1
 - Upstream released a new version
 
 * Mon Jun 22 2009 Mike McGrath <mmcgrath at redhat.com> - 3.0.6-4