- separate package for udev rules, fixed broken directory deps on systems

[packages/VirtualBox.git] / VirtualBox.spec

diff --git a/VirtualBox.spec b/VirtualBox.spec
index 96ec439a63a963ffb2099411f30f5d4a1ad94b2e..201521ee43a86eb2bd6a84338d2c7dccc8a43f77 100644 (file)
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -1,10 +1,8 @@
 #
 # TODO:
-# - separate udev stuff from kernel package
 # - Find how to compile with PLD CFLAGS/CXXFLAGS/LDFLAGS.
 # - Package SDK.
 # - Package utils (and write initscripts ?) for Guest OS.
-# - Add udev rule.
 # - Check License of VBoxGuestAdditions_*.iso, it's propably not GPL v2.
 #   If so check if it is distributable.
 #
@@ -13,7 +11,7 @@
 %bcond_without kernel          # don't build kernel module
 %bcond_without userspace       # don't build userspace package
 
-%define                rel             2
+%define                rel             6
 
 %if %{without kernel}
 %undefine      with_dist_kernel
@@ -123,6 +121,19 @@ wirtualnych są w całości przechowywane w XML-u i są niezależne od
 lokalnej maszyny. Dzięki temu można szybko i łatwo przenieść
 konfigurację maszyny wirtualnej na inny komputer.
 
+%package udev
+Summary:       udev rules for VirtualBox kernel modules
+Summary(pl.UTF-8):     Reguły udev dla modułw jądra Linuksa dla VirtualBoksa
+Release:       %{rel}@%{_kernel_ver_str}
+Group:         Base/Kernel
+Requires:      udev
+
+%description udev
+udev rules for VirtualBox kernel modules
+
+%description udev -l pl.UTF-8
+Reguły udev dla modułw jądra Linuksa dla VirtualBoksa
+
 %package -n kernel%{_alt_kernel}-misc-vboxadd
 Summary:       Linux kernel module for VirtualBox
 Summary(pl.UTF-8):     Moduł jądra Linuksa dla VirtualBoksa
@@ -132,7 +143,7 @@ Requires(post,postun):      /sbin/depmod
 Requires:      dev >= 2.9.0-7
 %if %{with dist_kernel}
 %requires_releq_kernel
-Requires(postun):      %releq_kernel
+#Requires(postun):     %%releq_kernel
 %endif
 Provides:      kernel(vboxadd) = %{version}-%{rel}
 
@@ -226,10 +237,17 @@ install %{SOURCE1} .
 KDIR="%{_builddir}/%{buildsubdir}/kernel"
 mkdir -p $KDIR
 cp -Ra %{_kernelsrcdir}/include $KDIR
+%ifarch %{x8664} %{ix86}
+if [ -d $KDIR/include/asm-x86 ]; then
+ln -sf $KDIR/include/asm-x86 $KDIR/include/asm
 %ifarch %{x8664}
-ln -sf $KDIR/include/asm-x86_64 $KDIR/include/asm
+else
+       ln -sf $KDIR/include/asm-x86_64 $KDIR/include/asm
 %else
-ln -sf $KDIR/include/asm-i386 $KDIR/include/asm
+else
+       ln -sf $KDIR/include/asm-i386 $KDIR/include/asm
+%endif
+fi
 %endif
 
 %if %{with dist_kernel}
@@ -255,8 +273,14 @@ rm -rf PLD-MODULE-BUILD && mkdir PLD-MODULE-BUILD && cd PLD-MODULE-BUILD
 ../src/VBox/Additions/linux/export_modules modules.tar.gz
        tar -zxf modules.tar.gz && rm -f modules.tar.gz
 
+%ifarch %{x8664}
+# HACK, is this really safe on x86_64?
+sed -i -e 's:#.*define.*RTMEMALLOC_EXEC_HEAP::g' vboxadd/r0drv/linux/alloc-r0drv-linux.c vboxvfs/r0drv/linux/alloc-r0drv-linux.c
+%endif
+
 %build_kernel_modules -m vboxadd -C vboxadd
 %build_kernel_modules -m vboxdrv -C vboxdrv
+cp -a vboxadd/Module.symvers vboxvfs
 %build_kernel_modules -m vboxvfs -C vboxvfs
 cd ..
 %endif
@@ -280,6 +304,11 @@ for f in {VBox{BFE,Manage,SDL,SVC,XPCOMIPCD},VirtualBox,vditool}; do
        ln -s %{_libdir}/VirtualBox/VirtualBox-wrapper.sh $RPM_BUILD_ROOT%{_bindir}/$f
 done
 
+%ifarch %{x8664}
+install out/linux.%{outdir}/release/bin/VBox*.rel \
+        $RPM_BUILD_ROOT%{_libdir}/VirtualBox
+%endif
+
 install out/linux.%{outdir}/release/bin/VBox*.so \
        $RPM_BUILD_ROOT%{_libdir}/VirtualBox
 install out/linux.%{outdir}/release/bin/{VBox{DD,DD2}{GC.gc,R0.r0},VMM{GC.gc,R0.r0},*.xpt} \
@@ -369,6 +398,9 @@ fi
 %attr(755,root,root) %{_libdir}/VirtualBox/VBoxSDL
 %attr(755,root,root) %{_libdir}/VirtualBox/VBoxXPCOMIPCD
 %attr(755,root,root) %{_libdir}/VirtualBox/VBox*.so
+%ifarch %{x8664}
+%attr(755,root,root) %{_libdir}/VirtualBox/VBox*.rel
+%endif
 %attr(755,root,root) %{_libdir}/VirtualBox/VirtualBox
 %attr(755,root,root) %{_libdir}/VirtualBox/VirtualBox-wrapper.sh
 %{_libdir}/VirtualBox/*.gc
@@ -399,6 +431,10 @@ fi
 %{_pixmapsdir}/VBox.png
 %{_desktopdir}/%{name}.desktop
 
+%files udev
+%defattr(644,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) /etc/udev/rules.d/virtualbox.rules
+
 # Drivers are for Guest OS, which is 32-bit.
 %ifnarch %{x8664}
 %files -n xorg-driver-input-vboxmouse
@@ -418,7 +454,6 @@ fi
 
 %files -n kernel%{_alt_kernel}-misc-vboxdrv
 %defattr(644,root,root,755)
-%config(noreplace) %verify(not md5 mtime size) /etc/udev/rules.d/virtualbox.rules
 /lib/modules/%{_kernel_ver}/misc/vboxdrv.ko*
 
 %files -n kernel%{_alt_kernel}-misc-vboxvfs