dgarcia/virtualbox
SHA256
1
0
Fork 0
forked from jengelh/virtualbox
Code Pull Requests Activity

Accepting request 888204 from home:gmbr3:Active

Browse Source 
- Use distconfdir for xinitrc.d files on TW

OBS-URL: https://build.opensuse.org/request/show/888204
OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=599
This commit is contained in:
Larry Finger
2021-04-24 16:53:46 +00:00
committed by Git OBS Bridge
parent 669b3a9807
commit ec54e74d1c
2 changed files with 51 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
virtualbox.spec
View File

@@ -40,6 +40,10 @@
%define _fillupdir /var/adm/fillup-templates
%endif
%if ! %{defined _distconfdir}
%define _distconfdir %{_sysconfdir}
%endif
# Use Python3 rather than Python2 by default
%define __python /usr/bin/python3
@@ -751,7 +755,7 @@ install -d %{buildroot}%{_unitdir}/multi-user.target.wants
install -d -m 755 %{buildroot}%{_sysconfdir}/vbox
install -d -m 755 %{buildroot}%{_sysconfdir}/vbox/autostart.d
install -d -m 755 %{buildroot}%{_udevrulesdir}
install -d -m 755 %{buildroot}%{_sysconfdir}/X11/xinit/xinitrc.d
install -d -m 755 %{buildroot}%{_distconfdir}/X11/xinit/xinitrc.d
###########################################
echo "entering guest-tools install section"
@@ -785,7 +789,7 @@ pushd out/linux.*/release/bin/additions/
install -m 755 VBoxClient %{buildroot}%{_bindir}
popd
# install init script which start VBoxClient daemon (support for clipboard,autoresize,seamless windows)
install -m 755 src/VBox/Additions/x11/Installer/98vboxadd-xclient %{buildroot}%{_sysconfdir}/X11/xinit/xinitrc.d/vboxadd-xclient.sh
install -m 755 src/VBox/Additions/x11/Installer/98vboxadd-xclient %{buildroot}%{_distconfdir}/X11/xinit/xinitrc.d/vboxadd-xclient.sh
##############################################
echo "entering virtualbox(-qt) install section"
@@ -1184,9 +1188,7 @@ export DISABLE_RESTART_ON_UPDATE=yes
%dir %{_libdir}/xorg/modules/input
%dir %{_libdir}/dri/
%{_bindir}/VBoxClient
%dir %{_sysconfdir}/X11/xinit
%dir %{_sysconfdir}/X11/xinit/xinitrc.d
%{_sysconfdir}/X11/xinit/xinitrc.d/vboxadd-xclient.sh
%{_distconfdir}/X11/xinit/xinitrc.d/vboxadd-xclient.sh
%files guest-tools
%defattr(-, root, root)