diff --git a/exim.changes b/exim.changes index f0773aa..bea3435 100644 --- a/exim.changes +++ b/exim.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Nov 23 13:43:04 UTC 2017 - rbrown@suse.com + +- Replace references to /var/adm/fillup-templates with new + %_fillupdir macro (boo#1069468) + ------------------------------------------------------------------- Mon Oct 9 11:36:38 UTC 2017 - dimstar@opensuse.org diff --git a/exim.spec b/exim.spec index ddc7eab..49bb7da 100644 --- a/exim.spec +++ b/exim.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 mysql %bcond_without pgsql %bcond_without sqlite @@ -313,7 +318,7 @@ mkdir -p $RPM_BUILD_ROOT/etc/logrotate.d mkdir -p $RPM_BUILD_ROOT/usr/{bin,sbin,lib} mkdir -p $RPM_BUILD_ROOT/var/log/exim mkdir -p $RPM_BUILD_ROOT/var/spool/mail/ -mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates +mkdir -p $RPM_BUILD_ROOT%{_fillupdir} mkdir -p $RPM_BUILD_ROOT%{_mandir}/man8 mkdir -p $RPM_BUILD_ROOT/usr/bin make inst_dest=$RPM_BUILD_ROOT/usr/sbin \ @@ -345,7 +350,7 @@ ln -sv service $RPM_BUILD_ROOT/usr/sbin/rcexim ln -sv ../../etc/init.d/exim $RPM_BUILD_ROOT/usr/sbin/rcexim %endif mv $RPM_BUILD_ROOT/usr/sbin/eximon* $RPM_BUILD_ROOT/usr/bin/ -cp -p %{S:1} $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.exim +cp -p %{S:1} $RPM_BUILD_ROOT%{_fillupdir}/sysconfig.exim install -m 0644 %{S:2} $RPM_BUILD_ROOT/etc/logrotate.d/exim # man pages mv doc/exim.8 $RPM_BUILD_ROOT/%{_mandir}/man8/ @@ -478,7 +483,7 @@ exit 0 /usr/bin/newaliases /usr/sbin/sendmail /usr/lib/sendmail -/var/adm/fillup-templates/sysconfig.exim +%{_fillupdir}/sysconfig.exim %dir %attr(750,mail,mail) /var/log/exim %files -n eximon