[nagios] * Own the configuration directory /etc/nagios/conf.d

[Jose Pedro Oliveira]

commit b0d0f28e7d237ab9bfe35504bcad38cf8e309bdf
Author: Jose Pedro Oliveira <jpo at di.uminho.pt>
Date:   Wed Apr 24 01:40:30 2013 +0100

     * Own the configuration directory /etc/nagios/conf.d

 nagios.spec |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)
---
diff --git a/nagios.spec b/nagios.spec
index 189a909..170a806 100644
--- a/nagios.spec
+++ b/nagios.spec
@@ -1,6 +1,6 @@
 Name: nagios
 Version: 3.5.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Host/service/network monitoring program
 
 Group: Applications/System
@@ -174,6 +174,7 @@ sed -i -e "s|NagiosCmd=/var/log/nagios/rw/nagios.cmd|NagiosCmd=%{_localstatedir}
 sed -i -e "s|resource.cfg|private/resource.cfg|" \
      -e "s|command_file=/var/log/nagios/rw/nagios.cmd|command_file=%{_localstatedir}/spool/%{name}/cmd/nagios.cmd|" sample-config/nagios.cfg 
 sed -e "s|/usr/lib/|%{_libdir}/|" %{SOURCE2} > %{name}.htaccess
+cp -f %{SOURCE3} internet.cfg
 cp -f %{SOURCE5} UpgradeToVersion3.ReadMe
 cp -f %{SOURCE6} UpgradeToVersion3.sh
 echo >> html/stylesheets/common.css
@@ -190,7 +191,7 @@ mv %{buildroot}%{_sbindir}/nagiostats %{buildroot}%{_bindir}/nagiostats
 install -d -m 0755 %{buildroot}%{_sysconfdir}/%{name}/private
 mv %{buildroot}%{_sysconfdir}/%{name}/resource.cfg %{buildroot}%{_sysconfdir}/%{name}/private/resource.cfg
 
-install -D -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/%{name}/conf.d/internet.cfg
+install -d -m 0755 %{buildroot}%{_sysconfdir}/%{name}/conf.d/
 install -D -m 0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/%{name}/passwd
 
 # Install header-file
@@ -244,6 +245,7 @@ fi
 %dir %{_datadir}/%{name}/html
 %doc %{_datadir}/%{name}/html/docs
 %doc Changelog INSTALLING LICENSE README UPGRADING UpgradeToVersion3.ReadMe UpgradeToVersion3.sh
+%doc internet.cfg
 %{_datadir}/%{name}/html/[^d]*
 %{_sbindir}/*
 %{_bindir}/*
@@ -255,8 +257,8 @@ fi
 %config(noreplace) %{_sysconfdir}/%{name}/objects/*cfg
 %attr(0750,root,nagios) %dir %{_sysconfdir}/%{name}/private
 %attr(0750,root,nagios) %dir %{_sysconfdir}/%{name}/objects
+%attr(0750,root,nagios) %dir %{_sysconfdir}/%{name}/conf.d
 %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}/passwd
 %attr(0640,root,apache) %config(noreplace) %{_datadir}/%{name}/html/config.inc.php
 %attr(2775,nagios,nagios) %dir %{_localstatedir}/spool/%{name}/cmd
@@ -278,6 +280,10 @@ fi
 
 
 %changelog
+* Wed Apr 24 2013 Jose Pedro Oliveira <jpo at di.uminho.pt> - 3.5.0-3
+- Own the configuration directory /etc/nagios/conf.d (#907145#c5)
+- Ship the internet.cfg configuration file as documentation (#907145#c5)
+
 * Sat Apr 20 2013 Jose Pedro Oliveira <jpo at di.uminho.pt> - 3.5.0-2
 - Patch nagios-3.4.3-spaces-to-plus-signs.patch (#952139)
   (upstream http://tracker.nagios.org/view.php?id=407)