diff --git a/mdadm.changes b/mdadm.changes index 7c783ac..313eee9 100644 --- a/mdadm.changes +++ b/mdadm.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Nov 23 13:40:30 UTC 2017 - rbrown@suse.com + +- Replace references to /var/adm/fillup-templates with new + %_fillupdir macro (boo#1069468) + ------------------------------------------------------------------- Wed Nov 15 01:27:06 UTC 2017 - gqjiang@suse.com diff --git a/mdadm.spec b/mdadm.spec index ed2a72a..7347c79 100644 --- a/mdadm.spec +++ b/mdadm.spec @@ -1,7 +1,7 @@ # # spec file for package mdadm # -# Copyright (c) 2017 SUSE LINUX Products 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 + Name: mdadm Version: 4.0 Release: 0 @@ -180,14 +185,14 @@ sgml2txt Software-RAID.HOWTO.sgml %install make install install-systemd install-udev DESTDIR=%{buildroot} SYSTEMD_DIR=%{_unitdir} UDEVDIR=%{_udevdir} SUSE=yes rm -rf %{buildroot}/lib/udev -install -d %{buildroot}%{_var}/adm/fillup-templates +install -d %{buildroot}%{_fillupdir} install -d %{buildroot}/usr/share/mdadm install -m 755 misc/mdcheck %{buildroot}/usr/share/mdadm/mdcheck install -d %{buildroot}/etc/cron.daily install -d %{buildroot}/etc/cron.d install -m 755 %{S:7} %{buildroot}/etc/cron.daily/mdadm install -m 644 %{S:3} %{buildroot}/etc/cron.d/mdadm -install -m 644 %{S:2} %{buildroot}%{_var}/adm/fillup-templates/ +install -m 644 %{S:2} %{buildroot}%{_fillupdir}/ install -d %{buildroot}%{_systemdshutdowndir} install -d %{buildroot}%{_sbindir} ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcmdmonitor @@ -221,7 +226,7 @@ ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcmdmonitor %{_sbindir}/rcmdmonitor %dir /usr/share/mdadm /usr/share/mdadm/* -%{_var}/adm/fillup-templates/sysconfig.mdadm +%{_fillupdir}/sysconfig.mdadm %{_udevdir}/rules.d/63-md-raid-arrays.rules %{_udevdir}/rules.d/64-md-raid-assembly.rules %dir /etc/cron.daily