diff --git a/dhcp.changes b/dhcp.changes index 1694477..762b12e 100644 --- a/dhcp.changes +++ b/dhcp.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Nov 23 13:49:18 UTC 2017 - rbrown@suse.com + +- Replace references to /var/adm/fillup-templates with new + %_fillupdir macro (boo#1069468) + ------------------------------------------------------------------- Fri Jul 14 09:48:25 UTC 2017 - dimstar@opensuse.org diff --git a/dhcp.spec b/dhcp.spec index ee4b9d6..d0129f5 100644 --- a/dhcp.spec +++ b/dhcp.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 + %define isc_version 4.3.5 %define susefw2dir %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services %define omc_prefix /usr/share/omc @@ -366,7 +371,7 @@ install -d -m0755 $RPM_BUILD_ROOT/%{omc_svcdir} install -d -m0755 $RPM_BUILD_ROOT%{_sysconfdir}/openldap/schema %endif install -d -m0755 $RPM_BUILD_ROOT%{_localstatedir}/run -install -d -m0755 $RPM_BUILD_ROOT%{_localstatedir}/adm/fillup-templates +install -d -m0755 $RPM_BUILD_ROOT%{_fillupdir} # chroot jail install -d -m0755 $RPM_BUILD_ROOT%{_localstatedir}/lib/{dhcp,dhcp6}/etc install -d -m0755 $RPM_BUILD_ROOT%{_localstatedir}/lib/{dhcp,dhcp6}/dev @@ -449,11 +454,11 @@ rm -f dhcpd.action %endif # sysconfig files install -m0644 $RPM_SOURCE_DIR/sysconfig.dhcpd \ - $RPM_BUILD_ROOT%{_localstatedir}/adm/fillup-templates/ + $RPM_BUILD_ROOT%{_fillupdir}/ install -m0644 $RPM_SOURCE_DIR/sysconfig.syslog-dhcpd \ - $RPM_BUILD_ROOT%{_localstatedir}/adm/fillup-templates/ + $RPM_BUILD_ROOT%{_fillupdir}/ install -m0644 $RPM_SOURCE_DIR/sysconfig.dhcrelay \ - $RPM_BUILD_ROOT%{_localstatedir}/adm/fillup-templates/ + $RPM_BUILD_ROOT%{_fillupdir}/ # another config files and scripts %if %{with_ldap} install -m0644 contrib/ldap/dhcp.schema \ @@ -682,8 +687,8 @@ if ! test -f /.buildenv; then rm -rf $RPM_BUILD_ROOT; fi %{omc_svcdir}/dhcpd6.xml %{_sysconfdir}/sysconfig/network/scripts/dhcpd-restart-hook %{_sysconfdir}/sysconfig/network/if-up.d/60-dhcpd-restart-hook -%{_localstatedir}/adm/fillup-templates/sysconfig.dhcpd -%{_localstatedir}/adm/fillup-templates/sysconfig.syslog-dhcpd +%{_fillupdir}/sysconfig.dhcpd +%{_fillupdir}/sysconfig.syslog-dhcpd %if %{with_doc_package} %files doc @@ -723,7 +728,7 @@ if ! test -f /.buildenv; then rm -rf $RPM_BUILD_ROOT; fi %config %{_sysconfdir}/init.d/dhcrelay6 %endif %doc %{_mandir}/man8/dhcrelay.8.gz -%{_localstatedir}/adm/fillup-templates/sysconfig.dhcrelay +%{_fillupdir}/sysconfig.dhcrelay %files devel %defattr(-,root,root)