diff --git a/.cvsignore b/.cvsignore index c4b5e0e..3c38c41 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -pnp-0.4.12.tar.gz +pnp-0.4.14.tar.gz diff --git a/pnp4nagios.spec b/pnp4nagios.spec index 8a63926..3fce3a7 100644 --- a/pnp4nagios.spec +++ b/pnp4nagios.spec @@ -1,6 +1,6 @@ Name: pnp4nagios -Version: 0.4.12 -Release: 4%{?dist} +Version: 0.4.14 +Release: 1%{?dist} Summary: Nagios performance data analysis tool Group: Applications/System @@ -10,11 +10,12 @@ Source0: http://downloads.sourceforge.net/%{name}/pnp-%{version}.tar.gz Source1: pnp4nagios.logrotate.conf Source2: pnp4nagios-npcd.sysvinit Source3: pnp4nagios-README.fedora +Patch1: pnp4nagios-0.4.14-change_broker_install_location.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: rrdtool +BuildRequires: rrdtool-perl Requires: nagios -Requires: rrdtool +Requires: rrdtool-perl Requires: php-gd Requires(post): chkconfig Requires(preun): chkconfig @@ -29,6 +30,7 @@ and stores them automatically into RRD-databases. %prep %setup -q -n pnp-%{version} +%patch1 -p0 cp -p %{SOURCE3} README.fedora sed -i -e 's/^INSTALL_OPTS="-o $nagios_user -g $nagios_grp"/INSTALL_OPTS=""/' \ configure @@ -93,6 +95,7 @@ fi %config(noreplace) %{_sysconfdir}/logrotate.d/pnp4nagios %attr(755,root,root) %{_initrddir}/npcd %attr(755,root,root) %{_sbindir}/npcd +%{_libdir}/nagios/brokers/npcdmod.o %dir %{_libexecdir}/pnp4nagios %attr(755,root,root) %{_libexecdir}/pnp4nagios/process_perfdata.pl %attr(755,root,root) %{_libexecdir}/pnp4nagios/check_pnp_rrds.pl @@ -103,6 +106,12 @@ fi %changelog +* Tue Aug 27 2009 Xavier Bachelot 0.4.14-1 +- Update to 0.4.14. +- Fix typo in README.fedora (RHBZ#490664). +- Move npcdmod.o to a better place. +- BR: rrdtool-perl + * Sun Jul 26 2009 Fedora Release Engineering - 0.4.12-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild diff --git a/sources b/sources index 81dbd0b..c64fb69 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -eb833a4769a5b58aad0ac53cae3e3e9f pnp-0.4.12.tar.gz +9dbbf08191a258f6798c9516b3821ff0 pnp-0.4.14.tar.gz