[packages/VirtualBox] - moved dkms under userspace bcond
baggins
baggins at pld-linux.org
Thu Feb 27 17:33:09 CET 2014
commit c38a3946f8e919ab46c0142efca773773b60e01d
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Thu Feb 27 17:32:52 2014 +0100
- moved dkms under userspace bcond
VirtualBox.spec | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/VirtualBox.spec b/VirtualBox.spec
index 47a0c92..069b80c 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -15,7 +15,7 @@
%bcond_without userspace # don't build userspace package
%bcond_with webservice # webservice (SOAP) support
%bcond_without lightdm # lightdm greeter
-%bcond_without dkms # build dkms package
+%bcond_without dkms # build dkms package
%bcond_without verbose
%if %{without kernel}
@@ -668,7 +668,6 @@ cp -p %{objdir}/Additions/Installer/linux/share/VBoxGuestAdditions/vbox-greeter.
%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/additions/mount.vboxsf
install -p mount.vboxsf $RPM_BUILD_ROOT/sbin/mount.vboxsf
-%endif
%if %{with dkms}
install -d $RPM_BUILD_ROOT%{_usrsrc}/vbox{host,guest}-%{version}-%{rel}
@@ -682,6 +681,7 @@ cp -p src/VBox/Additions/common/VBoxGuest/linux/dkms.conf $RPM_BUILD_ROOT%{_usrs
%{__make} -C $RPM_BUILD_ROOT%{_usrsrc}/vboxguest-%{version}-%{rel} clean
rm -rf $RPM_BUILD_ROOT%{_usrsrc}/vboxguest-%{version}-%{rel}/*/o
%endif
+%endif
%if %{with kernel}
install -d $RPM_BUILD_ROOT{/etc/modules-load.d,/sbin}
@@ -963,7 +963,6 @@ dkms remove -m vboxhost -v %{version}-%{rel} --rpm_safe_upgrade --all || :
%attr(755,root,root) %{_libdir}/VBoxOGLfeedbackspu.so
%attr(755,root,root) %{_libdir}/VBoxOGLpackspu.so
%attr(755,root,root) %{_libdir}/VBoxOGLpassthroughspu.so
-%endif
%if %{with dkms}
%files -n dkms-vboxguest
@@ -974,3 +973,4 @@ dkms remove -m vboxhost -v %{version}-%{rel} --rpm_safe_upgrade --all || :
%defattr(644,root,root,755)
%{_usrsrc}/vboxhost-%{version}-%{rel}
%endif
+%endif
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/VirtualBox.git/commitdiff/c38a3946f8e919ab46c0142efca773773b60e01d
More information about the pld-cvs-commit
mailing list