Hello community, here is the log from the commit of package nagios-rpm-macros for openSUSE:Factory checked in at 2014-06-30 21:45:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nagios-rpm-macros (Old) and /work/SRC/openSUSE:Factory/.nagios-rpm-macros.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "nagios-rpm-macros" Changes: -------- --- /work/SRC/openSUSE:Factory/nagios-rpm-macros/nagios-rpm-macros.changes 2014-04-26 06:06:11.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.nagios-rpm-macros.new/nagios-rpm-macros.changes 2014-06-30 21:45:45.000000000 +0200 @@ -1,0 +2,7 @@ +Mon Jun 23 14:24:20 UTC 2014 - thardeck@suse.com + +- update to 0.10: + + adapt icinga[2] macros to use /run instead of /var/run on modern systems + + this change can easily be used for other macros, just use %{_rundir} instead of "%{_localstatedir}/run" + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nagios-rpm-macros.spec ++++++ --- /var/tmp/diff_new_pack.WLgVTe/_old 2014-06-30 21:45:46.000000000 +0200 +++ /var/tmp/diff_new_pack.WLgVTe/_new 2014-06-30 21:45:46.000000000 +0200 @@ -20,7 +20,7 @@ Summary: RPM Macros for Nagios based packages License: BSD-3-Clause Group: System/Monitoring -Version: 0.09 +Version: 0.10 Release: 0 Url: http://en.opensuse.org/Nagios Source0: macros.nagios @@ -53,6 +53,11 @@ cat %{S:6} >> %{buildroot}%{_sysconfdir}/rpm/macros.nagios cat %{S:7} >> %{buildroot}%{_sysconfdir}/rpm/macros.nagios +# make sure that _rundir is working on older systems +%if ! %{defined _rundir} +sed -i 's|%%{_rundir}|%%{_localstatedir}/run|' %{buildroot}%{_sysconfdir}/rpm/macros.nagios +%endif + %clean rm -rf %buildroot ++++++ macros.icinga ++++++ --- /var/tmp/diff_new_pack.WLgVTe/_old 2014-06-30 21:45:46.000000000 +0200 +++ /var/tmp/diff_new_pack.WLgVTe/_new 2014-06-30 21:45:46.000000000 +0200 @@ -23,7 +23,7 @@ # Icinga spool dir %icinga_spooldir %{_var}/spool/icinga # Icinga run dir -%icinga_rundir %{_localstatedir}/run/icinga +%icinga_rundir %{_rundir}/icinga # Icinga logfile dir %icinga_logdir %{_var}/log/icinga # Icinga cgi directory ++++++ macros.icinga2 ++++++ --- /var/tmp/diff_new_pack.WLgVTe/_old 2014-06-30 21:45:46.000000000 +0200 +++ /var/tmp/diff_new_pack.WLgVTe/_new 2014-06-30 21:45:46.000000000 +0200 @@ -23,7 +23,7 @@ # Icinga spool dir %icinga2_spooldir %{_var}/spool/icinga2 # Icinga run dir -%icinga2_rundir %{_localstatedir}/run/icinga2 +%icinga2_rundir %{_rundir}/icinga2 # Icinga logfile dir %icinga2_logdir %{_var}/log/icinga2 # Icinga cgi directory -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org