diff --git a/rsyslog.changes b/rsyslog.changes index 6657cdd..9d13210 100644 --- a/rsyslog.changes +++ b/rsyslog.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Nov 23 13:41:39 UTC 2017 - rbrown@suse.com + +- Replace references to /var/adm/fillup-templates with new + %_fillupdir macro (boo#1069468) + ------------------------------------------------------------------- Fri Nov 17 15:34:42 UTC 2017 - astieger@suse.com diff --git a/rsyslog.spec b/rsyslog.spec index 8caa672..a85b8dc 100644 --- a/rsyslog.spec +++ b/rsyslog.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 + Name: rsyslog Summary: The enhanced syslogd for Linux and Unix License: (GPL-3.0+ and Apache-2.0) @@ -774,9 +779,9 @@ install -m0600 rsyslog.conf.$$ \ install -m0600 rsyslog.d.remote.conf.$$ \ %{buildroot}%{_sysconfdir}/rsyslog.d/remote.conf # -install -d -m0755 %{buildroot}/var/adm/fillup-templates +install -d -m0755 %{buildroot}%{_fillupdir} install -m0600 %{_sourcedir}/rsyslog.sysconfig \ - %{buildroot}/var/adm/fillup-templates/sysconfig.syslog-rsyslog + %{buildroot}%{_fillupdir}/sysconfig.syslog-rsyslog # rm -f doc/Makefile* install -d -m0755 %{buildroot}%{rsyslogdocdir}/html/ @@ -1015,7 +1020,7 @@ fi %doc %{rsyslogdocdir}/AUTHORS %doc %{rsyslogdocdir}/COPYING* %dir %{_localstatedir}/spool/rsyslog -/var/adm/fillup-templates/sysconfig.syslog-rsyslog +%{_fillupdir}/sysconfig.syslog-rsyslog %attr(0755,root,root) %dir %ghost %{rsyslog_rundir} %attr(0644,root,root) %ghost %{rsyslog_sockets_cfg} %if %{with systemd} && ! %{with systemv}