Hello community, here is the log from the commit of package monitoring-plugins for openSUSE:Factory checked in at 2017-04-29 10:53:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/monitoring-plugins (Old) and /work/SRC/openSUSE:Factory/.monitoring-plugins.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "monitoring-plugins" Sat Apr 29 10:53:52 2017 rev:5 rq:491853 version:2.2 Changes: -------- --- /work/SRC/openSUSE:Factory/monitoring-plugins/monitoring-plugins.changes 2017-01-24 10:38:03.514729408 +0100 +++ /work/SRC/openSUSE:Factory/.monitoring-plugins.new/monitoring-plugins.changes 2017-04-29 10:54:14.466152262 +0200 @@ -1,0 +2,13 @@ +Fri Apr 21 15:25:57 CEST 2017 - ro@suse.de + +- disable requires for apparmor on non-suse for now + +------------------------------------------------------------------- +Fri Apr 21 12:13:06 CEST 2017 - ro@suse.de + +- adapt buildrequires for centos +- enclose all permissions handling with if suse_version +- wrap recommends with if suse_version +- disable radius check (no freeradius-client-devel rpm found) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ monitoring-plugins.spec ++++++ --- /var/tmp/diff_new_pack.8QIIey/_old 2017-04-29 10:54:15.434015534 +0200 +++ /var/tmp/diff_new_pack.8QIIey/_new 2017-04-29 10:54:15.438014969 +0200 @@ -63,7 +63,9 @@ BuildRequires: bind-utils BuildRequires: dhcp-devel BuildRequires: fping +%if 0%{?suse_version} PreReq: permissions +%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} > 1210 BuildRequires: libgnutls-devel @@ -79,7 +81,12 @@ BuildRequires: openldap2-devel BuildRequires: openssh BuildRequires: openssl-devel +%if 0%{?fedora_version} || 0%{?rhel_version} || 0%{?centos_version} +BuildRequires: net-snmp-perl +BuildRequires: net-snmp-utils +%else BuildRequires: perl-Net-SNMP +%endif BuildRequires: postfix BuildRequires: postgresql-devel BuildRequires: procps @@ -108,6 +115,7 @@ %endif # recommend the old, included checks to allow an easy update - but # also allow users to deselect some of the new sub-packages +%if 0%{?suse_version} Recommends: %{name}-bgpstate Recommends: %{name}-breeze Recommends: %{name}-by_ssh @@ -155,8 +163,12 @@ Recommends: %{name}-users Recommends: %{name}-wave Suggests: %{name}-cups +%endif %define apt_get_command %{_bindir}/apt-get %define qstat_command %{_bindir}/qstat +%if ! 0%{?suse_version} +%define _libexecdir %{nagios_plugindir} +%endif %description The actual service checks on current monitoring solutions like Icinga, @@ -170,6 +182,7 @@ Summary: Plug-Ins which depend on additional packages Group: System/Monitoring Requires: %{name}-common = %{version} +%if 0%{?suse_version} Recommends: %{name}-fping Recommends: %{name}-hpjd Recommends: %{name}-ldap @@ -178,6 +191,7 @@ Recommends: %{name}-snmp Suggests: %{name}-apt Suggests: %{name}-game +%endif Provides: nagios-plugins-extras = %{version} Obsoletes: nagios-plugins-extras <= 1.5 @@ -188,6 +202,7 @@ %package all Summary: All Monitoring-Plugin checks Group: System/Monitoring +%if 0%{?suse_version} Recommends: %{name}-apt Recommends: %{name}-bgpstate Recommends: %{name}-bind @@ -249,8 +264,10 @@ Recommends: %{name}-real Recommends: %{name}-rpc Recommends: %{name}-rsync +%endif Provides: nagios-plugins-all = %{version} Obsoletes: nagios-plugins-all <= 1.5 +%if 0%{?suse_version} %ifnarch ppc ppc64 sparc sparc64 s390 s390x Recommends: %{name}-sensors %endif @@ -266,6 +283,7 @@ Recommends: %{name}-wave Recommends: %{name}-zypper Recommends: nagios-xen-host +%endif %description all This virtual package recommends all currently available, official @@ -415,8 +433,8 @@ Recommends: apparmor-parser Recommends: apparmor-profiles %else -Requires: apparmor-parser -Requires: apparmor-profiles +#Requires: apparmor-parser +#Requires: apparmor-profiles %endif %description dhcp @@ -585,7 +603,12 @@ Summary: Monitor network interfaces Group: System/Monitoring Requires: %{name}-common = %{version} +%if 0%{?fedora_version} || 0%{?rhel_version} || 0%{?centos_version} +Requires: net-snmp-perl +Requires: net-snmp-utils +%else Requires: perl-Net-SNMP +%endif Provides: nagios-plugins-ifoperstatus = %{version} Obsoletes: nagios-plugins-ifoperstatus <= 1.5 @@ -597,7 +620,12 @@ Summary: Monitor operational status network interfaces Group: System/Monitoring Requires: %{name}-common = %{version} +%if 0%{?fedora_version} || 0%{?rhel_version} || 0%{?centos_version} +Requires: net-snmp-perl +Requires: net-snmp-utils +%else Requires: perl-Net-SNMP +%endif Provides: nagios-plugins-ifstatus = %{version} Obsoletes: nagios-plugins-ifstatus <= 1.5 @@ -667,7 +695,9 @@ %package mrtg Summary: Check average or maximum value in an MRTG logfile Group: System/Monitoring +%if 0%{?suse_version} Recommends: mrtg +%endif Provides: nagios-plugins-mrtg = %{version} Obsoletes: nagios-plugins-mrtg <= 1.5 @@ -678,7 +708,9 @@ %package mrtgtraf Summary: Check incoming/outgoing transfer rates of a router Group: System/Monitoring +%if 0%{?suse_version} Recommends: mrtg +%endif Provides: nagios-plugins-mrtgtraf = %{version} Obsoletes: nagios-plugins-mrtgtraf <= 1.5 @@ -748,8 +780,8 @@ Recommends: apparmor-parser Recommends: apparmor-profiles %else -Requires: apparmor-parser -Requires: apparmor-profiles +#Requires: apparmor-parser +#Requires: apparmor-profiles %endif %description ntp_time @@ -825,6 +857,7 @@ The process count can be filtered by process owner, parent process PID, current state (e.g., 'Z'), or may be the total number of running processes. +%if 0%{?suse_version} %package radius Summary: Test RADIUS server Group: System/Monitoring @@ -841,6 +874,7 @@ listing. This risk is exacerbated because nagios will run the plugin at regular predictable intervals. Please be sure that the password used does not allow access to sensitive system resources. +%endif %package real Summary: Test REAL service @@ -1033,8 +1067,10 @@ %prep %setup -q +%if 0%{?suse_version} %{__mkdir_p} example/permissions.d %{__cp} %{S:11} example/permissions.d/%{name} +%endif %{__cp} %{S:12} ./README.SUSE %{__cp} %{S:13} ./README.SUSE-check_dhcp %{__cp} %{S:14} ./README.SUSE-check_icmp @@ -1090,7 +1126,7 @@ --with-ps-format='%s %d %d %d %d %d %f %s %s %n' \ --with-ps-cols=10 \ --with-ps-varlist='procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procetime,procprog,&pos' \ -%if 0%{suse_version} > 1300 +%if 0%{?suse_version} > 1300 --with-rpcinfo-command=/sbin/rpcinfo \ %else --with-rpcinfo-command=%{_sbindir}/rpcinfo \ @@ -1170,6 +1206,7 @@ %clean %{__rm} -rf %{buildroot} +%if 0%{?suse_version} %post dhcp # in case somebody uses the permissions file we provide # in docdir, run permission here @@ -1202,12 +1239,15 @@ %set_permissions monitoring-plugins %endif fi +%endif %files %defattr(-,root,root) %doc ABOUT-NLS ACKNOWLEDGEMENTS AUTHORS ChangeLog CODING COPYING FAQ %doc NEWS README REQUIREMENTS SUPPORT THANKS README.SUSE +%if 0%{?suse_version} %doc example +%endif %files all %defattr(-,root,root) @@ -1239,7 +1279,9 @@ %defattr(-,root,root) %doc ABOUT-NLS ACKNOWLEDGEMENTS AUTHORS ChangeLog CODING COPYING FAQ %doc NEWS README REQUIREMENTS SUPPORT THANKS README.SUSE +%if 0%{?suse_version} %doc example +%endif %dir %{nagios_libdir} %dir %{nagios_plugindir} %dir %{_sysconfdir}/%{name} @@ -1459,10 +1501,12 @@ %{nagios_plugindir}/check_procs_perf %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/apparmor.d/usr.lib.nagios.plugins.check_procs +%if 0%{?suse_version} %files radius %defattr(0755,root,root) %dir %{nagios_plugindir} %{nagios_plugindir}/check_radius +%endif %files real %defattr(0755,root,root)