rpms/nagios/devel nagios.spec,1.49,1.50

[Robert M. Albrecht (romal)]

Author: romal

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

Modified Files:
	nagios.spec 
Log Message:
Updates spec to nagios3



Index: nagios.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nagios/devel/nagios.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- nagios.spec	26 May 2008 18:32:40 -0000	1.49
+++ nagios.spec	10 Jul 2008 15:19:32 -0000	1.50
@@ -1,21 +1,23 @@
-
 Name: nagios
 
-Version: 2.12
-Release: 3%{?dist}
+Version: 3.0.3
+Release: 4%{?dist}
 Summary: Host/service/network monitoring program
 
 Group: Applications/System
 License: GPLv2+
 URL: http://www.nagios.org/
-Source0: http://dl.sourceforge.net/nagios/%{name}-%{version}.tar.gz
+Source0: http://downloads.sourceforge.net/nagios/%{name}-%{version}.tar.gz
 Source1: nagios.logrotate
 Source2: nagios.htaccess
+Source3: nagios.internet.cfg
+Source4: nagios.htpasswd
 Patch0: nagios-initrd.patch
+Patch1: nagios.cfg.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: gd-devel > 1.8, mailx, libjpeg-devel, libpng-devel
-%if 0%{?fedora} > 7
+%if "%{?fedora}" > "7"
 BuildRequires:  perl-devel
 BuildRequires:  perl(ExtUtils::Embed)
 %endif
@@ -149,7 +151,7 @@
 %dir %{_datadir}/%{name}
 %dir %{_datadir}/%{name}/html
 %doc %{_datadir}/%{name}/html/docs
-%doc Changelog INSTALLING LICENSE README UPGRADING 
+%doc Changelog INSTALLING LICENSE README UPGRADING
 %{_datadir}/%{name}/html/[^d]*
 %{_sbindir}/*
 %{_bindir}/*
@@ -158,19 +160,44 @@
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/nagios.conf
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 %config(noreplace) %{_sysconfdir}/%{name}/*cfg
-
+%config(noreplace) %{_sysconfdir}/%{name}/objects/*cfg
 %attr(0750,root,nagios) %dir %{_sysconfdir}/%{name}/private
+%attr(0750,root,nagios) %dir %{_sysconfdir}/%{name}/objects
 %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(0755,nagios,nagios) %dir %{_localstatedir}/spool/%{name}
 %attr(2775,nagios,nagios) %dir %{_localstatedir}/spool/%{name}/cmd
 %attr(0755,nagios,nagios) %dir %{_localstatedir}/log/%{name}
 %attr(0755,nagios,nagios) %dir %{_localstatedir}/log/%{name}/archives
+%attr(0755,nagios,nagios) %dir %{_localstatedir}/log/%{name}/spool/
+%attr(0755,nagios,nagios) %dir %{_localstatedir}/log/%{name}/spool/checkresults
 
 %files devel
 %defattr(-,root,root)
 %{_includedir}/%{name}
 
 %changelog
+* Wed Jul 02 2008 Robert M. Albrecht <romal at gmx.de> 3.0.3-4
+- renamed preconfigured passwd to .htpasswd to enable Apaches .ht* protection
+- added default .htpasswd with user nagiosadmin password nagiosadmin
+
+* Tue Jul 01 2008 Robert M. Albrecht <romal at gmx.de> 3.0.3-3
+- Added Apache style conf.d
+- Added a working example config named internet.cfg
+- The object folder was created twice
+
+* Tue Jul 01 2008 Robert M. Albrecht <romal at gmx.de> 3.0.3-2
+- Fixed folder /var/log/nagios/spool/checkresults
+- silenced rpmlint (tabs, spaces)
+- silenced rpmlint (configure missing libdir)
+
+* Sun Jun 29 2008 Robert M. Albrecht <romal at gmx.de> 3.0.3-1
+- Upstream released 3.0.3
+
+* Sun Jun 22 2008 Robert M. Albrecht <romal at gmx.de> 3.0.2-1
+- Upstream released 3.0.2
+
 * Mon May 26 2008 Shawn Starr <shawn.starr at rogers.com> 2.12-3
 - Fix spec seems to break for Fedora 10+