diff --git a/rrdtool.changes b/rrdtool.changes index 4e66cb7..96e3add 100644 --- a/rrdtool.changes +++ b/rrdtool.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Nov 23 13:53:48 UTC 2017 - rbrown@suse.com + +- Replace references to /var/adm/fillup-templates with new + %_fillupdir macro (boo#1069468) + ------------------------------------------------------------------- Mon Jul 24 12:14:04 UTC 2017 - dimstar@opensuse.org diff --git a/rrdtool.spec b/rrdtool.spec index 6bf19ac..9ff4f76 100644 --- a/rrdtool.spec +++ b/rrdtool.spec @@ -16,6 +16,11 @@ # +#Compat macro for new _fillupdir macro introduced in Nov 2017 +%if ! %{defined _fillupdir} + %define _fillupdir /var/adm/fillup-templates +%endif + %bcond_without lua %bcond_without python %bcond_without ruby @@ -286,7 +291,7 @@ rm %{buildroot}%{_docdir}/%{name}/txt/*.pod find %{buildroot}%{_docdir}/%{name}/examples/ -type f -exec chmod 0644 "{}" "+" # install rrdcached specials -install -D -m 644 %{SOURCE2} %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.rrdcached +install -D -m 644 %{SOURCE2} %{buildroot}%{_fillupdir}/sysconfig.rrdcached # install systemd specific files install -D -m 0755 %{SOURCE4} %{buildroot}%{_datadir}/rrdcached/rrdcached-systemd-pre @@ -380,7 +385,7 @@ getent passwd %{rrdcached_user} >/dev/null || useradd -s /sbin/nologin -g %{rrdc %{_mandir}/man1/rrdcached* %{_bindir}/rrdcached %{_sbindir}/rcrrdcached -%{_localstatedir}/adm/fillup-templates/sysconfig.rrdcached +%{_fillupdir}/sysconfig.rrdcached %{_datadir}/rrdcached %{_datadir}/rrdcached/rrdcached-systemd-pre %{_unitdir}/rrdcached.service