[nagios] Ver. 3.2.2
Peter Lemenkov
peter at fedoraproject.org
Sat Sep 11 17:12:29 UTC 2010
commit 5cea53546ce7d96412c4a7fbdfcffdb6cb3ef2b1
Author: Peter Lemenkov <lemenkov at gmail.com>
Date: Sat Sep 11 21:12:18 2010 +0400
Ver. 3.2.2
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
.gitignore | 1 +
nagios.spec | 89 +++++++++++++++++++++++++++++++++-------------------------
sources | 2 +-
3 files changed, 53 insertions(+), 39 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 044f3f0..2a75df8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
nagios-3.2.1.tar.gz
+/nagios-3.2.2.tar.gz
diff --git a/nagios.spec b/nagios.spec
index 93b4ed0..21a5e9d 100644
--- a/nagios.spec
+++ b/nagios.spec
@@ -1,6 +1,6 @@
Name: nagios
-Version: 3.2.1
-Release: 6%{?dist}
+Version: 3.2.2
+Release: 1%{?dist}
Summary: Host/service/network monitoring program
Group: Applications/System
@@ -23,9 +23,11 @@ BuildRequires: perl(CPAN)
BuildRequires: perl(ExtUtils::MakeMaker)
BuildRequires: perl(ExtUtils::Embed)
BuildRequires: perl(Test::Harness)
+BuildRequires: perl(Test::HTML::Lint)
BuildRequires: perl(Test::More)
BuildRequires: perl(Test::Simple)
+
Requires: httpd
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
Requires(preun): initscripts, chkconfig
@@ -131,49 +133,49 @@ may compile against.
--with-template-extinfo
make %{?_smp_mflags} all
-%{__sed} -e "s| package Embed::Persistent;|#\!%{_bindir}/perl\npackage Embed::Persistent;|" < p1.pl > p1.pl.fedora
-%{__sed} -e "s/# chkconfig: 345/# chkconfig: - /" \
+sed -e "s| package Embed::Persistent;|#\!%{_bindir}/perl\npackage Embed::Persistent;|" < p1.pl > p1.pl.fedora
+sed -e "s/# chkconfig: 345/# chkconfig: - /" \
-e "s|NagiosCmd=/var/log/nagios/rw/nagios.cmd|NagiosCmd=%{_localstatedir}/spool/%{name}/cmd/nagios.cmd|" < daemon-init > daemon-init.fedora
-%{__sed} -e "s|resource.cfg|private/resource.cfg|" \
+sed -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 > sample-config/nagios.cfg.fedora
-%{__sed} -e "s|/usr/lib/|%{_libdir}/|" %{SOURCE2} > %{name}.htaccess
-%{__mv} -f sample-config/nagios.cfg.fedora sample-config/nagios.cfg
-%{__cp} -f %{SOURCE5} UpgradeToVersion3.ReadMe
-%{__cp} -f %{SOURCE6} UpgradeToVersion3.sh
+sed -e "s|/usr/lib/|%{_libdir}/|" %{SOURCE2} > %{name}.htaccess
+mv -f sample-config/nagios.cfg.fedora sample-config/nagios.cfg
+cp -f %{SOURCE5} UpgradeToVersion3.ReadMe
+cp -f %{SOURCE6} UpgradeToVersion3.sh
echo >> html/stylesheets/common.css
%install
rm -rf %{buildroot}
make DESTDIR=%{buildroot} INSTALL_OPTS="" COMMAND_OPTS="" install-config
-%{__install} -d -m 0775 %{buildroot}/%{_localstatedir}/spool/%{name}/cmd
-%{__install} -d -m 0755 %{buildroot}/%{_prefix}/include/%{name}
-%{__install} -d -m 0755 %{buildroot}/%{_sysconfdir}/%{name}
-%{__install} -d -m 0755 %{buildroot}/%{_sysconfdir}/%{name}/private
-%{__install} -D -m 0755 base/nagios %{buildroot}/%{_sbindir}/nagios
-%{__install} -D -m 0755 base/nagiostats %{buildroot}/%{_bindir}/nagiostats
-%{__install} -d -m 0755 cgi/ %{buildroot}/%{_libdir}/%{name}/cgi-bin/
-%{__install} -D -m 0755 cgi/*cgi %{buildroot}/%{_libdir}/%{name}/cgi-bin/
-%{__install} -D -m 0644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/logrotate.d/%{name}
-%{__install} -d -m 0755 %{buildroot}/%{_libdir}/%{name}/plugins/eventhandlers
-%{__install} -D -m 0644 include/locations.h %{buildroot}/%{_includedir}/%{name}/locations.h
-%{__install} -D -m 0644 %{name}.htaccess %{buildroot}/%{_sysconfdir}/httpd/conf.d/%{name}.conf
-%{__install} -D -m 0755 daemon-init.fedora %{buildroot}/%{_initrddir}/%{name}
-%{__install} -d -m 0755 html/ %{buildroot}/%{_datadir}/%{name}/html
-%{__install} -d -m 0755 %{buildroot}/%{_localstatedir}/log/%{name}/archives
-%{__install} -D -m 0755 p1.pl.fedora %{buildroot}/%{_sbindir}/p1.pl
-%{__install} -d -m 0755 %{buildroot}/%{_sysconfdir}/%{name}/objects
-%{__install} -d -m 0755 %{buildroot}/%{_sysconfdir}/%{name}/conf.d
-%{__install} -D -m 0644 %{SOURCE3} %{buildroot}/%{_sysconfdir}/%{name}/conf.d/internet.cfg
-%{__install} -D -m 0644 %{SOURCE4} %{buildroot}/%{_sysconfdir}/%{name}/.htpasswd
-%{__install} -D -m 0755 p1.pl.fedora %{buildroot}/%{_sbindir}/p1.pl
-%{__install} -d -m 0755 %{buildroot}/%{_localstatedir}/log/%{name}/spool/checkresults
-%{__mkdir} -p %{buildroot}/%{_initrddir}
-%{__mkdir} -p %{buildroot}/%{_sysconfdir}/httpd/conf.d/
-%{__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 %{buildroot}/%{_sysconfdir}/%{name}/private/resource.cfg
+install -d -m 0775 %{buildroot}/%{_localstatedir}/spool/%{name}/cmd
+install -d -m 0755 %{buildroot}/%{_prefix}/include/%{name}
+install -d -m 0755 %{buildroot}/%{_sysconfdir}/%{name}
+install -d -m 0755 %{buildroot}/%{_sysconfdir}/%{name}/private
+install -D -m 0755 base/nagios %{buildroot}/%{_sbindir}/nagios
+install -D -m 0755 base/nagiostats %{buildroot}/%{_bindir}/nagiostats
+install -d -m 0755 cgi/ %{buildroot}/%{_libdir}/%{name}/cgi-bin/
+install -D -m 0755 cgi/*cgi %{buildroot}/%{_libdir}/%{name}/cgi-bin/
+install -D -m 0644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/logrotate.d/%{name}
+install -d -m 0755 %{buildroot}/%{_libdir}/%{name}/plugins/eventhandlers
+install -D -m 0644 include/locations.h %{buildroot}/%{_includedir}/%{name}/locations.h
+install -D -m 0644 %{name}.htaccess %{buildroot}/%{_sysconfdir}/httpd/conf.d/%{name}.conf
+install -D -m 0755 daemon-init.fedora %{buildroot}/%{_initrddir}/%{name}
+install -d -m 0755 html/ %{buildroot}/%{_datadir}/%{name}/html
+install -d -m 0755 %{buildroot}/%{_localstatedir}/log/%{name}/archives
+install -D -m 0755 p1.pl.fedora %{buildroot}/%{_sbindir}/p1.pl
+install -d -m 0755 %{buildroot}/%{_sysconfdir}/%{name}/objects
+install -d -m 0755 %{buildroot}/%{_sysconfdir}/%{name}/conf.d
+install -D -m 0644 %{SOURCE3} %{buildroot}/%{_sysconfdir}/%{name}/conf.d/internet.cfg
+install -D -m 0644 %{SOURCE4} %{buildroot}/%{_sysconfdir}/%{name}/passwd
+install -D -m 0755 p1.pl.fedora %{buildroot}/%{_sbindir}/p1.pl
+install -d -m 0755 %{buildroot}/%{_localstatedir}/log/%{name}/spool/checkresults
+mkdir -p %{buildroot}/%{_initrddir}
+mkdir -p %{buildroot}/%{_sysconfdir}/httpd/conf.d/
+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 %{buildroot}/%{_sysconfdir}/%{name}/private/resource.cfg
%clean
@@ -206,6 +208,11 @@ fi
/sbin/service httpd condrestart > /dev/null 2>&1 || :
+# missing buildrequires
+#%check
+#make test
+
+
%files
%defattr(-,root,root,-)
%dir %{_sysconfdir}/%{name}
@@ -228,7 +235,7 @@ fi
%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(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
%attr(0755,nagios,nagios) %dir %{_localstatedir}/log/%{name}
@@ -249,6 +256,12 @@ fi
%changelog
+* Sat Sep 11 2010 Peter Lemenkov <lemenkov at gmail.com> - 3.2.2-1
+- Ver. 3.2.2 (rhbz #629439).
+- Cleanup spec-file
+- Ensure that %%{_sysconfdir}/httpd/conf.d/nagios.conf points to
+ the actual passwd file (see rhbz #576571).
+
* Tue Aug 24 2010 Adam Tkac <atkac redhat com> - 3.2.1-6
- rebuild
diff --git a/sources b/sources
index 487abac..aee3eda 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d4655ee8c95c9679fd4fd53dac34bbe3 nagios-3.2.1.tar.gz
+e73004f401bfd680631ba900b5a8e60a nagios-3.2.2.tar.gz
More information about the scm-commits
mailing list