From cfd6bb89e48ab842a53050e229f70f957636eefe Mon Sep 17 00:00:00 2001 From: Mike McGrath Date: Feb 21 2006 10:36:06 +0000 Subject: Forgot to add spec file while updating to nagios-2.0 stable --- diff --git a/nagios.spec b/nagios.spec index f7eb9ee..c9d5c3d 100644 --- a/nagios.spec +++ b/nagios.spec @@ -1,12 +1,12 @@ Name: nagios Version: 2.0 -Release: 0.6.rc2%{?dist} +Release: 1%{?dist} Summary: Host/service/network monitoring program Group: Applications/System License: GPL URL: http://www.nagios.org/ -Source0: http://dl.sourceforge.net/nagios/%{name}-%{version}rc2.tar.gz +Source0: http://dl.sourceforge.net/nagios/%{name}-%{version}.tar.gz Source1: nagios.logrotate Source2: nagios.htaccess BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -50,7 +50,7 @@ This package provides include files that Nagios-related applications may compile against. %prep -%setup -q -n nagios-2.0rc2 +%setup -q %build ./configure \ @@ -115,10 +115,8 @@ rm -rf %{buildroot} > /dev/null 2>&1 %{_sbindir}/useradd -d %{_localstatedir}/spool/%{name} -r -s /sbin/nologin nagios 2> /dev/null || : %preun -if [ $1 = 0 ]; then - /sbin/service nagios stop > /dev/null 2>&1 || : - /sbin/chkconfig --del %{name} || : -fi +/sbin/service nagios stop > /dev/null 2>&1 || : +/sbin/chkconfig --del %{name} || : %post /sbin/chkconfig --add %{name} || : @@ -145,8 +143,8 @@ fi %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %config(noreplace) %{_sysconfdir}/%{name}/*cfg-sample -%attr(0750,root,nagios) %dir %{_sysconfdir}/%{name}/private -%attr(0640,root,nagios) %config(noreplace) %{_sysconfdir}/%{name}/private/resource.cfg-sample +%attr(0750,root,root) %dir %{_sysconfdir}/%{name}/private +%attr(0640,root,root) %config(noreplace) %{_sysconfdir}/%{name}/private/resource.cfg-sample %attr(2775,nagios,nagios) %dir %{_localstatedir}/spool/%{name} %attr(0755,nagios,nagios) %dir %{_localstatedir}/log/%{name} %attr(0755,nagios,nagios) %dir %{_localstatedir}/log/%{name}/archives @@ -156,21 +154,15 @@ fi %{_includedir}/%{name} %changelog -* Wed Feb 15 2006 Mike McGrath 2.0-0.6.rc2 --Upgrade no longer uninstalls Nagios from chkconfig - -* Tue Feb 14 2006 Mike McGrath 2.0-0.5.rc2 --Rebuild for Fedora Extras 5 - -* Tue Feb 09 2006 Mike McGrath 2.0-0.4.rc2 -- Made /private/* group owner Nagios. This fixes SIGHUP config read issue. - -* Mon Feb 06 2006 Mike McGrath 2.0-0.3.rc2 -- Added proper basic Auth to Apache config for non SSL users +* Tue Feb 21 2006 Mike McGrath imlinux@gmail.com> 2.0-1 +- Upstream released 2.0 (changes below) +- Fix for segfault in timed event queue +- Removed length limitations for object vars/vals +- Updated config.sub and config.guess to versions from automake-1.9 +- Doc updates * Sat Feb 04 2006 Mike McGrath 2.0-0.2.rc2 - Fixed default options in Apache config -- Fixed %{_libdir} in Apache config for x86_64 machines * Fri Jan 27 2006 Mike McGrath 2.0-0.1.rc2 - Using 2.0rc2 tarball