Hello community, here is the log from the commit of package nrpe for openSUSE:Factory checked in at 2017-12-20 10:40:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nrpe (Old) and /work/SRC/openSUSE:Factory/.nrpe.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nrpe" Wed Dec 20 10:40:22 2017 rev:7 rq:558578 version:3.2.1 Changes: -------- --- /work/SRC/openSUSE:Factory/nrpe/nrpe.changes 2017-12-06 09:00:40.484404628 +0100 +++ /work/SRC/openSUSE:Factory/.nrpe.new/nrpe.changes 2017-12-20 10:40:26.500479223 +0100 @@ -1,0 +2,11 @@ +Fri Dec 15 18:37:27 UTC 2017 - o...@botter.cc + +- remove additional reference to removed nrpe@.service file + +------------------------------------------------------------------- +Wed Dec 6 09:08:26 UTC 2017 - l...@linux-schulserver.de + +- remove unneeded nrpe@.service file +- cleanup the %%pre/%%post commands + +------------------------------------------------------------------- Old: ---- nrpe@.service ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nrpe.spec ++++++ --- /var/tmp/diff_new_pack.hNHmbF/_old 2017-12-20 10:40:27.740389412 +0100 +++ /var/tmp/diff_new_pack.hNHmbF/_new 2017-12-20 10:40:27.744389122 +0100 @@ -43,7 +43,6 @@ Source4: nrpe.8 Source5: check_nrpe.cfg Source6: nrpe.service -Source7: nrpe@.service Source8: nrpe.socket Source10: README.SUSE Source11: README.SUSE.systemd-addon @@ -275,13 +274,11 @@ %if %{with systemd} # install systemd specific files install -Dm644 %{SOURCE6} %{buildroot}%{_unitdir}/%{name}.service -install -Dm644 %{SOURCE7} %{buildroot}%{_unitdir}/%{name}@.service %if 0%{?centos_version} sed -i -e "/User=/s/\(User=\).*/\1%{nagios_user}/" -e "/Group=/s/\(Group=\).*/\1%{nagios_group}/" -e "/Requires=var-run.mount/d" %{buildroot}%{_unitdir}/%{name}.service %else sed -i -e "/User=/s/\(User=\).*/\1%{nagios_user}/" -e "/Group=/s/\(Group=\).*/\1%{nagios_group}/" %{buildroot}%{_unitdir}/%{name}.service %endif -sed -i -e "/User=/s/\(User=\).*/\1%{nagios_user}/" -e "/Group=/s/\(Group=\).*/\1%{nagios_group}/" %{buildroot}%{_unitdir}/%{name}@.service install -Dm644 %{SOURCE8} %{buildroot}%{_unitdir}/%{name}.socket install -d -m 0755 %{buildroot}/%{_tmpfilesdir} echo "d %{_rundir}/%{name} 0755 %{nagios_user} %{nagios_group} -" > %{buildroot}/%{_tmpfilesdir}/%{name}.conf @@ -307,38 +304,40 @@ echo "nrpe %nrpeport/tcp # Nagios nrpe" >> etc/services fi %if %{with systemd} -%if 0%{?centos_version} -#systemd_pre nrpe.service nrpe@.service nrpe.socket -%else -%service_add_pre nrpe.service nrpe@.service nrpe.socket -%endif + %if 0%{?centos_version} + #systemd_pre nrpe.service nrpe.socket + %else + %service_add_pre nrpe.service nrpe.socket + %endif %endif %preun -%stop_on_removal %{name} %if %{with systemd} -%if 0%{?centos_version} -%systemd_preun nrpe.service nrpe@.service nrpe.socket + %if 0%{?centos_version} + %systemd_preun nrpe.service nrpe.socket + %else + %service_del_preun nrpe.service nrpe.socket + %endif %else -%service_del_preun nrpe.service nrpe@.service nrpe.socket -%endif +%stop_on_removal %{name} %endif %post %if 0%{?suse_version} -%if 0%{?suse_version} <= 1230 -%{fillup_and_insserv -fy %{name}} -%else -%fillup_only %{name} -%endif + %if 0%{?suse_version} <= 1230 + %{fillup_and_insserv -fy %{name}} + %else + %fillup_only %{name} + %endif %endif + %if %{with systemd} -%if 0%{?centos_version} -%systemd_post nrpe.service nrpe@.service nrpe.socket -%else -%service_add_post nrpe.service nrpe@.service nrpe.socket -%endif -%{_bindir}/systemd-tmpfiles --create %{_tmpfilesdir}/%{name}.conf + %if 0%{?centos_version} + %systemd_post nrpe.service nrpe.socket + %else + %service_add_post nrpe.service nrpe.socket + %tmpfiles_create %{_tmpfilesdir}/%{name}.conf + %endif %endif %pre -n monitoring-plugins-nrpe @@ -384,16 +383,16 @@ fi %postun -%restart_on_update nrpe %if 0%{?suse_version} -%insserv_cleanup + %insserv_cleanup + %if %{with systemd} + %service_del_postun nrpe.service nrpe.socket + %else + %restart_on_update nrpe + %endif %endif -%if %{with systemd} %if 0%{?centos_version} -%systemd_postun_with_restart nrpe.service nrpe@.service nrpe.socket -%else -%service_del_postun nrpe.service nrpe@.service nrpe.socket -%endif + %systemd_postun_with_restart nrpe.service nrpe.socket %endif %files @@ -419,7 +418,6 @@ %endif %if %{with systemd} %{_unitdir}/%{name}.service -%{_unitdir}/%{name}@.service %{_unitdir}/%{name}.socket %{_tmpfilesdir}/%{name}.conf %ghost %dir %{_rundir}/%{name}