diff --git a/varnish.changes b/varnish.changes index b4350e1..c36360e 100644 --- a/varnish.changes +++ b/varnish.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Nov 23 13:50:41 UTC 2017 - rbrown@suse.com + +- Replace references to /var/adm/fillup-templates with new + %_fillupdir macro (boo#1069468) + ------------------------------------------------------------------- Fri Jun 23 19:42:07 UTC 2017 - antoine.belvire@opensuse.org diff --git a/varnish.spec b/varnish.spec index ede61d9..73e9f1c 100644 --- a/varnish.spec +++ b/varnish.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 library_name libvarnishapi1 %define pkg_home %_localstatedir/lib/%name %define pkg_logdir %_localstatedir/log/%name @@ -120,7 +125,7 @@ install -dm 0755 "$b"/{%pkg_logdir,%pkg_home}; install -Dpm 0644 "%{S:5}" "$b/%_sysconfdir/logrotate.d/varnish"; # ##init scripts -install -Dpm 0644 "%{S:3}" "$b%_localstatedir/adm/fillup-templates/sysconfig.%name"; +install -Dpm 0644 "%{S:3}" "$b%{_fillupdir}/sysconfig.%name"; install -Dpm 0644 "%{S:7}" "$b/%_unitdir/varnish.service"; install -Dpm 0644 "%{S:8}" "$b/%_unitdir/varnishlog.service"; mkdir -p "$b/%_sbindir"; @@ -182,7 +187,7 @@ fi %dir %attr(0750,varnish,varnish) %pkg_home %dir %attr(0750,varnish,varnish) %pkg_cachedir %dir %attr(0750,varnish,varnish) %pkg_logdir -%_localstatedir/adm/fillup-templates/sysconfig.%name +%{_fillupdir}/sysconfig.%name %files -n %library_name %defattr(-,root,root,-)