Nagios dependencies removed, but icinga2 dependencies added

This commit is contained in:
2017-07-22 09:27:52 +02:00
parent dc6167cf0b
commit d7d0658a5a

View File

@@ -1,6 +1,6 @@
Name: pnp4nagios Name: pnp4nagios
Version: 0.6.25 Version: 0.6.25
Release: 5%{?dist} Release: 6%{?dist}
Summary: Nagios performance data analysis tool Summary: Nagios performance data analysis tool
Group: Applications/System Group: Applications/System
@@ -14,10 +14,14 @@ Patch1: pnp4nagios-httpd24.patch
Patch2: pnp4nagios-pnp-helper.patch Patch2: pnp4nagios-pnp-helper.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# this package requires icinga2 instead of nagios!
%define user icinga
%define grp icinga
BuildRequires: autoconf, automake, libtool BuildRequires: autoconf, automake, libtool
BuildRequires: rrdtool-perl BuildRequires: rrdtool-perl
BuildRequires: perl(Time::HiRes) BuildRequires: perl(Time::HiRes)
Requires: nagios # this package requires icinga2 instead of nagios!
Requires: icinga2
Requires: rrdtool-perl Requires: rrdtool-perl
Requires: php-gd Requires: php-gd
Requires(post): chkconfig Requires(post): chkconfig
@@ -125,9 +129,9 @@ fi
%{_libdir}/nagios/brokers/npcdmod.o %{_libdir}/nagios/brokers/npcdmod.o
%dir %{_libexecdir}/%{name} %dir %{_libexecdir}/%{name}
%attr(755,root,root) %{_libexecdir}/%{name}/* %attr(755,root,root) %{_libexecdir}/%{name}/*
%attr(755,nagios,nagios) %{_localstatedir}/lib/%{name} %attr(755,%{user},%{grp}) %{_localstatedir}/lib/%{name}
%attr(755,nagios,nagios) %{_localstatedir}/log/%{name} %attr(755,%{user},%{grp}) %{_localstatedir}/log/%{name}
%attr(755,nagios,nagios) %{_localstatedir}/spool/%{name} %attr(755,%{user},%{grp}) %{_localstatedir}/spool/%{name}
%{_datadir}/nagios/html/%{name} %{_datadir}/nagios/html/%{name}
# Remove install check script # Remove install check script
# as it is not required if all dependencies are met. # as it is not required if all dependencies are met.
@@ -138,6 +142,9 @@ fi
%{_datadir}/nagios/html/%{name}/kohana %{_datadir}/nagios/html/%{name}/kohana
%changelog %changelog
* Sat Jul 22 2017 Daniel Steiner <dsteiner@redhat.com> - 0.6.25-6
- Package requires now icinga2 instead of nagios. User/group changed to icinga
* Sat Jul 22 2017 Daniel Steiner <dsteiner@redhat.com> - 0.6.25-5 * Sat Jul 22 2017 Daniel Steiner <dsteiner@redhat.com> - 0.6.25-5
- PHP error fixed in pnp.php helper module - PHP error fixed in pnp.php helper module