Hello community, here is the log from the commit of package nrpe for openSUSE:Factory checked in at 2020-08-14 13:11:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nrpe (Old) and /work/SRC/openSUSE:Factory/.nrpe.new.3399 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nrpe" Fri Aug 14 13:11:39 2020 rev:12 rq:823539 version:3.2.1 Changes: -------- --- /work/SRC/openSUSE:Factory/nrpe/nrpe.changes 2020-02-29 21:23:57.898451250 +0100 +++ /work/SRC/openSUSE:Factory/.nrpe.new.3399/nrpe.changes 2020-08-14 13:11:42.445264560 +0200 @@ -1,0 +2,5 @@ +Tue Jul 28 15:05:57 UTC 2020 - Thorsten Kukuk <[email protected]> + +- Don't install SuSEfirewall2 service file, SuSEfirewall2 is gone + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nrpe.spec ++++++ --- /var/tmp/diff_new_pack.tETC7I/_old 2020-08-14 13:11:43.009264775 +0200 +++ /var/tmp/diff_new_pack.tETC7I/_new 2020-08-14 13:11:43.013264776 +0200 @@ -235,12 +235,7 @@ %endif %endif -%if %{with firewalld} - # firewalld service file - handled by firewalld package now - # install -Dm 644 %{SOURCE13} %{buildroot}%{_libexecdir}/firewalld/services/%{name}.xml - # temporary: also install SuSEfirewall2 snipplet for a while - install -Dm644 %{SOURCE3} %{buildroot}/%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/nrpe -%else +%if %{without firewalld} # install SuSEfirewall2 script install -Dm644 %{SOURCE3} %{buildroot}/%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/nrpe %endif @@ -355,7 +350,9 @@ echo "include=%{_sysconfdir}/nrpe.cfg" >> %{nagios_sysconfdir}/nrpe.cfg fi sed -i "s|%{nagios_sysconfdir}/nrpe.cfg|%{_sysconfdir}/nrpe.cfg|g" %{_sysconfdir}/xinetd.d/nrpe || : +%if %{without firewalld} sed -i "s|nrpe-service|%{name}|g" %{_sysconfdir}/sysconfig/SuSEfirewall2 || : +%endif if [ -e %{_localstatedir}/adm/update-scripts/nrpe ]; then /bin/sh %{_localstatedir}/adm/update-scripts/nrpe rm %{_localstatedir}/adm/update-scripts/nrpe @@ -387,7 +384,9 @@ %dir %{_sysconfdir}/xinetd.d %endif %config(noreplace) %{_sysconfdir}/xinetd.d/nrpe +%if %{without firewalld} %config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/nrpe +%endif %if 0%{?suse_version} <= 1230 %ghost %{_rundir}/%{name}/nrpe.pid %endif
