diff --git a/ebtables.changes b/ebtables.changes index 21ae129..a90d28f 100644 --- a/ebtables.changes +++ b/ebtables.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Nov 23 13:37:47 UTC 2017 - rbrown@suse.com + +- Replace references to /var/adm/fillup-templates with new + %_fillupdir macro (boo#1069468) + ------------------------------------------------------------------- Thu Mar 23 15:14:46 UTC 2017 - kstreitova@suse.com diff --git a/ebtables.spec b/ebtables.spec index 8281708..ad54c07 100644 --- a/ebtables.spec +++ b/ebtables.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: ebtables Version: 2.0.10.4 Release: 0 @@ -92,16 +97,16 @@ make \ INITDIR="%{_sysconfdir}/init.d" \ SYSCONFIGDIR="%{_sysconfdir}" \ install -mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates +mkdir -p %{buildroot}%{_fillupdir} mkdir -p %{buildroot}%{_unitdir} install -p %{SOURCE1} %{buildroot}%{_unitdir}/ chmod -x %{buildroot}%{_unitdir}/*.service mkdir -p %{buildroot}%{_libexecdir} install -m0755 %{SOURCE2} %{buildroot}%{_libexecdir}/ebtables ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name} -touch %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.%{name}.filter -touch %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.%{name}.nat -touch %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.%{name}.broute +touch %{buildroot}%{_fillupdir}/sysconfig.%{name}.filter +touch %{buildroot}%{_fillupdir}/sysconfig.%{name}.nat +touch %{buildroot}%{_fillupdir}/sysconfig.%{name}.broute rm -rf %{buildroot}%{_initrddir} # not used rm -f "%{buildroot}/%{_sysconfdir}/ebtables-config" @@ -126,9 +131,9 @@ rm -f "%{buildroot}/%{_sysconfdir}/ebtables-config" %config(noreplace) %{_sysconfdir}/ethertypes %{_libexecdir}/%{name} %{_unitdir}/%{name}.service -%ghost %{_localstatedir}/adm/fillup-templates/sysconfig.%{name}.filter -%ghost %{_localstatedir}/adm/fillup-templates/sysconfig.%{name}.nat -%ghost %{_localstatedir}/adm/fillup-templates/sysconfig.%{name}.broute +%ghost %{_fillupdir}/sysconfig.%{name}.filter +%ghost %{_fillupdir}/sysconfig.%{name}.nat +%ghost %{_fillupdir}/sysconfig.%{name}.broute %dir %{_libdir}/%{name} %{_libdir}/%{name}/*.so %{_sbindir}/ebtables