File project.diff of Package virtualbox

Overview Repositories Revisions Requests Users Attributes Meta

File project.diff of Package virtualbox (Revision 56288dd8eb5b2266a40a52aab6cfc418)

Currently displaying revision 56288dd8eb5b2266a40a52aab6cfc418 , Show latest

--- virtualbox-kmp-files.orig
+++ virtualbox-kmp-files
@@ -1,10 +1,10 @@
 %defattr (-,root,root)
-%dir /lib/modules/%2-%1/
-%dir /lib/modules/%2-%1/extra
-/lib/modules/%2-%1/extra/vboxdrv.ko
-/lib/modules/%2-%1/extra/vboxnetadp.ko
-/lib/modules/%2-%1/extra/vboxnetflt.ko
-/lib/modules/%2-%1/extra/vboxsf.ko
-/lib/modules/%2-%1/extra/vboxguest.ko
-#/lib/modules/%2-%1/extra/vboxvideo.ko
+%dir %{?usrmerged:/usr}/lib/modules/%2-%1/
+%dir %{?usrmerged:/usr}/lib/modules/%2-%1/extra
+%{?usrmerged:/usr}/lib/modules/%2-%1/extra/vboxdrv.ko
+%{?usrmerged:/usr}/lib/modules/%2-%1/extra/vboxnetadp.ko
+%{?usrmerged:/usr}/lib/modules/%2-%1/extra/vboxnetflt.ko
+%{?usrmerged:/usr}/lib/modules/%2-%1/extra/vboxsf.ko
+%{?usrmerged:/usr}/lib/modules/%2-%1/extra/vboxguest.ko
+#%%{?usrmerged:/usr}/lib/modules/%2-%1/extra/vboxvideo.ko
 
--- virtualbox.changes.orig
+++ virtualbox.changes
@@ -1,4 +1,9 @@
 -------------------------------------------------------------------
+Tue Oct 12 12:12:46 UTC 2021 - Hans-Peter Jansen <hpj@urpla.net>
+
+- Fix another usrmerge fallout
+
+-------------------------------------------------------------------
 Tue Oct  5 15:46:41 UTC 2021 - Hans-Peter Jansen <hpj@urpla.net>
 
 - Fix ldconfig invocation in scriptlets
--- virtualbox.spec.orig
+++ virtualbox.spec
@@ -302,6 +302,8 @@ hardware. VirtualBox is freely available
 the terms of the GNU Public License (GPL).
 
 
+
+
 ##########################################
 
 %package qt
@@ -321,6 +323,8 @@ Obsoletes:      %{name}-ose-qt < %{versi
 This package contains the code for the GUI used to control VMs.
 
 
+
+
 #########################################
 
 %package websrv
@@ -334,6 +338,8 @@ Obsoletes:      %{name}-vboxwebsrv < %{v
 The VirtualBox web server is used to control headless VMs using a browser.
 
 
+
+
 #########################################
 
 %package guest-x11
@@ -349,6 +355,8 @@ Obsoletes:      xorg-x11-driver-virtualb
 This package contains X11 guest utilities and X11 guest mouse and video drivers
 
 
+
+
 ###########################################
 
 %package guest-tools
@@ -369,6 +377,8 @@ Requires(pre):  net-tools-deprecated
 VirtualBox guest addition tools.
 
 
+
+
 ###########################################
 
 %package -n python3-%{name}
@@ -389,6 +399,8 @@ Obsoletes:      python3-%{name}-ose < %{
 Python XPCOM bindings to %{name}. Used e.g. by vboxgtk package.
 
 
+
+
 ###########################################
 
 %package devel
@@ -404,6 +416,8 @@ Obsoletes:      %{name}-ose-devel < %{ve
 Development file for %{name}
 
 
+
+
 ###########################################
 
 %package host-source
@@ -437,6 +451,8 @@ sudo /usr/sbin/vboxguestconfig
 
 
 
+
+
 ###########################################
 
 %package guest-desktop-icons
@@ -451,6 +467,8 @@ This package contains icons for guest de
 
 
 
+
+
 ###########################################
 
 %package vnc

Places

File project.diff of Package virtualbox (Revision 56288dd8eb5b2266a40a52aab6cfc418)

Places