From 799f49a9404a58471dfeb0b3b2013e7d553efd50f8c4f190d54098c4c6e7d764 Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Thu, 23 Nov 2017 17:10:09 +0000 Subject: [PATCH] Accepting request 544759 from home:RBrownSUSE:branches:Virtualization Replace references to /var/adm/fillup-templates with new %_fillupdir macro (boo#1069468) OBS-URL: https://build.opensuse.org/request/show/544759 OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=385 --- virtualbox.changes | 6 ++++++ virtualbox.spec | 11 ++++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/virtualbox.changes b/virtualbox.changes index 52e9ffb..0b7522c 100644 --- a/virtualbox.changes +++ b/virtualbox.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Nov 23 13:47:36 UTC 2017 - rbrown@suse.com + +- Replace references to /var/adm/fillup-templates with new + %_fillupdir macro (boo#1069468) + ------------------------------------------------------------------- Wed Nov 22 16:39:22 UTC 2017 - Larry.Finger@lwfinger.net diff --git a/virtualbox.spec b/virtualbox.spec index 2854db6..d03b7e0 100644 --- a/virtualbox.spec +++ b/virtualbox.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 + # Do not provide libGL.so symbols - they are owned by Mesa already and this could potentially confuse rpm/zypp %global __provides_exclude ^libE?GL.so.1.*$ @@ -672,8 +677,8 @@ ln -sf %{_unitdir}/vboxdrv.service %{buildroot}%{_unitdir}/multi-user.target.wa ln -sf %{_unitdir}/vboxadd-service.service %{buildroot}%{_unitdir}/multi-user.target.wants/vboxadd-service.service ln -sf %{_unitdir}/vboxes.service %{buildroot}%{_unitdir}/multi-user.target.wants/vboxes.service # sysconfig file intended for vboxes script -install -d -m 755 %{buildroot}%{_var}/adm/fillup-templates -install -m 640 %{SOURCE13} %{buildroot}%{_var}/adm/fillup-templates/sysconfig.vbox +install -d -m 755 %{buildroot}%{_fillupdir} +install -m 640 %{SOURCE13} %{buildroot}%{_fillupdir}/sysconfig.vbox # config file for vboxdrv script and vboxweb install -d -m 755 %{buildroot}%{_sysconfdir}/vbox @@ -896,7 +901,7 @@ export DISABLE_RESTART_ON_UPDATE=yes %{_unitdir}/multi-user.target.wants/vboxes.service %dir %{_sysconfdir}/vbox %config %{_sysconfdir}/vbox/vbox.cfg -%{_var}/adm/fillup-templates/sysconfig.vbox +%{_fillupdir}/sysconfig.vbox %{_sbindir}/rcvboxes %{_sbindir}/rcvboxdrv /sbin/vboxconfig