diff --git a/autossh.changes b/autossh.changes index 5b67458..29673b0 100644 --- a/autossh.changes +++ b/autossh.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Nov 23 13:44:07 UTC 2017 - rbrown@suse.com + +- Replace references to /var/adm/fillup-templates with new + %_fillupdir macro (boo#1069468) + ------------------------------------------------------------------- Tue Sep 15 08:40:56 UTC 2015 - multyrealm@gmail.com diff --git a/autossh.spec b/autossh.spec index 6c911d4..f1011a6 100644 --- a/autossh.spec +++ b/autossh.spec @@ -1,7 +1,7 @@ # # spec file for package autossh # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,6 +16,11 @@ # +#Compat macro for new _fillupdir macro introduced in Nov 2017 +%if ! %{defined _fillupdir} + %define _fillupdir /var/adm/fillup-templates +%endif + %if 0%{?suse_version} > 1220 %define with_systemd 1 %else @@ -77,7 +82,7 @@ ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rcautossh %else %__install -D -m 755 %{S:1} %{buildroot}%{_initrddir}/autossh %__ln_s -f %{_initrddir}/autossh %{buildroot}%{_sbindir}/rcautossh -%__install -D -m 644 %{S:2} %{buildroot}/var/adm/fillup-templates/sysconfig.autossh +%__install -D -m 644 %{S:2} %{buildroot}%{_fillupdir}/sysconfig.autossh %endif %__rm "$RPM_BUILD_ROOT/usr/share/doc/autossh"/{CHANGES,README} %__rm -rf "%{buildroot}%{_datadir}/examples" @@ -113,7 +118,7 @@ ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rcautossh %{_unitdir}/%{name}@.service %else %{_initrddir}/autossh -/var/adm/fillup-templates/sysconfig.autossh +%{_fillupdir}/sysconfig.autossh %endif %{_sbindir}/rcautossh %doc %{_mandir}/man1/autossh.1*