diff --git a/nagios.spec b/nagios.spec index b30b11a..88a63b8 100644 --- a/nagios.spec +++ b/nagios.spec @@ -1,11 +1,12 @@ + Name: nagios -Version: 2.9 -Release: 1%{?dist} +Version: 2.10 +Release: 3%{?dist} Summary: Host/service/network monitoring program Group: Applications/System -License: GPL +License: GPLv2+ URL: http://www.nagios.org/ Source0: http://dl.sourceforge.net/nagios/%{name}-%{version}.tar.gz Source1: nagios.logrotate @@ -13,7 +14,7 @@ Source2: nagios.htaccess Patch0: nagios-initrd.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: gd-devel > 1.8, mailx +BuildRequires: gd-devel > 1.8, mailx, perl-devel, libjpeg-devel, libpng-devel Requires: httpd Requires(pre): %{_sbindir}/useradd Requires(preun): /sbin/service, /sbin/chkconfig @@ -110,7 +111,7 @@ make DESTDIR=%{buildroot} INSTALL_OPTS="" COMMAND_OPTS="" install-config %{__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 @@ -148,10 +149,10 @@ fi %{_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} @@ -162,6 +163,23 @@ fi %{_includedir}/%{name} %changelog +* Thu Nov 29 2007 Mike McGrath 2.10-3 +- Upstream released 2.10 +- Renamed cfg-sample configs to just .cfg +- Added BR of perl-devel, libjpeg-devel, libpng-devel + +* Wed Sep 26 2007 Mike McGrath 2.9-5 +- rebuild for koji test + +* Sat Sep 08 2007 Mike McGrath 2.9-4 +- rebuild + +* Wed Aug 22 2007 Mike McGrath 2.9-3 +- Rebuild for ppc32 and license + +* Tue Jul 10 2007 Mike McGrath 2.9-2 +- Release bump + * Fri Jun 29 2007 Mike McGrath 2.9-1 - Upstream released 2.9 diff --git a/sources b/sources index 60f395f..873e770 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b6e3a21c91edb063c00712c6001e15ec nagios-2.9.tar.gz +8c3a29e138f2ff8c8abbd3dd8a40c4b6 nagios-2.10.tar.gz