rpms/nagios/devel nagios.spec,1.36,1.37

[Michael Patrick McGrath (mmcgrath)]

Author: mmcgrath

Update of /cvs/extras/rpms/nagios/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14125

Modified Files:
	nagios.spec 
Log Message:
no longer storing sample configs as sample, they are just .cfg


Index: nagios.spec
===================================================================
RCS file: /cvs/extras/rpms/nagios/devel/nagios.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- nagios.spec	29 Nov 2007 14:23:48 -0000	1.36
+++ nagios.spec	29 Nov 2007 14:56:16 -0000	1.37
@@ -2,7 +2,7 @@
 Name: nagios
 
 Version: 2.10
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Host/service/network monitoring program
 
 Group: Applications/System
@@ -111,7 +111,7 @@
 %{__cp} -a html/* %{buildroot}/%{_datadir}/%{name}/html/
 %{__rm} -f %{buildroot}/%{_datadir}/%{name}/html/*in
 %{__rm} -f %{buildroot}/%{_datadir}/%{name}/html/Makefile
-%{__mv} %{buildroot}/%{_sysconfdir}/%{name}/resource.cfg-sample %{buildroot}/%{_sysconfdir}/%{name}/private/resource.cfg-sample
+%{__mv} %{buildroot}/%{_sysconfdir}/%{name}/resource.cfg %{buildroot}/%{_sysconfdir}/%{name}/private/resource.cfg
 
 %clean
 rm -rf %{buildroot} > /dev/null 2>&1
@@ -149,10 +149,10 @@
 %{_initrddir}/nagios
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/nagios.conf
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
-%config(noreplace) %{_sysconfdir}/%{name}/*cfg-sample
+%config(noreplace) %{_sysconfdir}/%{name}/*cfg
 
 %attr(0750,root,nagios) %dir %{_sysconfdir}/%{name}/private
-%attr(0640,root,nagios) %config(noreplace) %{_sysconfdir}/%{name}/private/resource.cfg-sample
+%attr(0640,root,nagios) %config(noreplace) %{_sysconfdir}/%{name}/private/resource.cfg
 %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}
@@ -163,8 +163,9 @@
 %{_includedir}/%{name}
 
 %changelog
-* Thu Nov 29 2007 Mike McGrath <mmcgrath at redhat.com> 2.10-1
+* Thu Nov 29 2007 Mike McGrath <mmcgrath at redhat.com> 2.10-2
 - Upstream released 2.10
+- Renamed cfg-sample configs to just .cfg
 
 * Wed Sep 26 2007 Mike McGrath <mmcgrath at redhat.com> 2.9-5
 - rebuild for koji test