- 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 62a60e370292367b43c9d1ccc64580431e7253c8..201521ee43a86eb2bd6a84338d2c7dccc8a43f77 100644 (file)
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -3,7 +3,6 @@
 # - 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.
 #
@@ -12,7 +11,7 @@
 %bcond_without kernel          # don't build kernel module
 %bcond_without userspace       # don't build userspace package
 
-%define                _rel            1
+%define                rel             6
 
 %if %{without kernel}
 %undefine      with_dist_kernel
@@ -22,7 +21,7 @@ Summary:      VirtualBox - x86 hardware virtualizer
 Summary(pl.UTF-8):     VirtualBox - wirtualizator sprzętu x86
 Name:          VirtualBox
 Version:       1.5.4
-Release:       %{_rel}
+Release:       %{rel}
 License:       GPL v2
 Group:         Applications/Emulators
 Source0:       http://www.virtualbox.org/download/%{version}/%{name}-%{version}_OSE.tar.bz2
@@ -31,8 +30,9 @@ Source1:      http://www.virtualbox.org/download/%{version}/UserManual.pdf
 # Source1-md5: f56f0d904013cbc0940108ed042e539d
 Source2:       http://www.virtualbox.org/download/%{version}/VBoxGuestAdditions_%{version}.iso
 # Source2-md5: e021a51fc5946659b0789d134b1fd5ff
-Source3:       %{name}.desktop
-Source4:       %{name}.sh
+Source3:       %{name}.init
+Source4:       %{name}.desktop
+Source5:       %{name}.sh
 Patch0:                %{name}-configure.patch
 Patch1:                %{name}-qt-paths.patch
 Patch2:                %{name}-shared-libstdc++.patch
@@ -50,6 +50,7 @@ BuildRequires:        libIDL-devel
 BuildRequires: libuuid-devel
 BuildRequires: libxslt-progs
 BuildRequires: pkgconfig
+BuildRequires: pulseaudio-devel
 BuildRequires: qt-devel >= 6:3.3.6
 BuildRequires: qt-linguist
 BuildRequires: rpmbuild(macros) >= 1.329
@@ -72,9 +73,9 @@ ExclusiveArch:        %{ix86} %{x8664}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %ifarch %{x8664}
-%define                _outdir amd64
+%define                outdir  amd64
 %else
-%define                _outdir x86
+%define                outdir  x86
 %endif
 
 %description
@@ -120,18 +121,31 @@ 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
-Release:       %{_rel}@%{_kernel_ver_str}
+Release:       %{rel}@%{_kernel_ver_str}
 Group:         Base/Kernel
 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}
+Provides:      kernel(vboxadd) = %{version}-%{rel}
 
 %description -n kernel%{_alt_kernel}-misc-vboxadd
 Linux kernel module vboxadd for VirtualBox.
@@ -142,7 +156,7 @@ Moduł jądra Linuksa vboxadd dla VirtualBoksa.
 %package -n kernel%{_alt_kernel}-misc-vboxdrv
 Summary:       Linux kernel module for VirtualBox
 Summary(pl.UTF-8):     Moduł jądra Linuksa dla VirtualBoksa
-Release:       %{_rel}@%{_kernel_ver_str}
+Release:       %{rel}@%{_kernel_ver_str}
 Group:         Base/Kernel
 Requires(post,postun): /sbin/depmod
 Requires:      dev >= 2.9.0-7
@@ -150,7 +164,7 @@ Requires:   dev >= 2.9.0-7
 %requires_releq_kernel
 Requires(postun):      %releq_kernel
 %endif
-Provides:      kernel(vboxdrv) = %{version}-%{_rel}
+Provides:      kernel(vboxdrv) = %{version}-%{rel}
 
 %description -n kernel%{_alt_kernel}-misc-vboxdrv
 Linux kernel module vboxdrv for VirtualBox.
@@ -161,7 +175,7 @@ Moduł jądra Linuksa vboxdrv dla VirtualBoksa.
 %package -n kernel%{_alt_kernel}-misc-vboxvfs
 Summary:       Linux kernel module for VirtualBox
 Summary(pl.UTF-8):     Moduł jądra Linuksa dla VirtualBoksa
-Release:       %{_rel}@%{_kernel_ver_str}
+Release:       %{rel}@%{_kernel_ver_str}
 Group:         Base/Kernel
 Requires(post,postun): /sbin/depmod
 Requires:      dev >= 2.9.0-7
@@ -169,7 +183,7 @@ Requires:   dev >= 2.9.0-7
 %requires_releq_kernel
 Requires(postun):      %releq_kernel
 %endif
-Provides:      kernel(vboxvfs) = %{version}-%{_rel}
+Provides:      kernel(vboxvfs) = %{version}-%{rel}
 
 %description -n kernel%{_alt_kernel}-misc-vboxvfs
 Linux kernel module vboxvfs for VirtualBox.
@@ -179,8 +193,8 @@ Moduł jądra Linuksa vboxvfs dla VirtualBoksa.
 
 %package -n xorg-driver-input-vboxmouse
 Summary:       X.org mouse driver for VirtualBox guest OS
-Summary(pl.UTF-8):     Sterownik myszy dla systemu gościa w VirtualBox'ie
-Release:       %{_rel}
+Summary(pl.UTF-8):     Sterownik myszy dla systemu gościa w VirtualBoksie
+Release:       %{rel}
 Group:         X11/Applications
 Requires:      xorg-xserver-server >= 1.0.99.901
 
@@ -188,12 +202,12 @@ Requires: xorg-xserver-server >= 1.0.99.901
 X.org mouse driver for VirtualBox guest OS.
 
 %description -n xorg-driver-input-vboxmouse  -l pl.UTF-8
-Sterownik myszy dla systemu gościa w VirtualBox'ie.
+Sterownik myszy dla systemu gościa w VirtualBoksie.
 
 %package -n xorg-driver-video-vboxvideo
 Summary:       X.org video driver for VirtualBox guest OS
-Summary(pl.UTF-8):     Sterownik grafiki dla systemu gościa w VirtualBox'ie
-Release:       %{_rel}
+Summary(pl.UTF-8):     Sterownik grafiki dla systemu gościa w VirtualBoksie
+Release:       %{rel}
 Group:         X11/Applications
 Requires:      xorg-xserver-server >= 1.0.99.901
 
@@ -201,7 +215,7 @@ Requires:   xorg-xserver-server >= 1.0.99.901
 X.org video driver for VirtualBox guest OS.
 
 %description -n xorg-driver-video-vboxvideo -l pl.UTF-8
-Sterownik grafiki dla systemu gościa w VirtualBox'ie.
+Sterownik grafiki dla systemu gościa w VirtualBoksie.
 
 %prep
 %setup -q -n %{name}-%{version}_OSE
@@ -223,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}
@@ -251,9 +272,15 @@ rm -rf PLD-MODULE-BUILD && mkdir PLD-MODULE-BUILD && cd PLD-MODULE-BUILD
        tar -zxf modules.tar.gz && rm -f modules.tar.gz
 ../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
@@ -265,38 +292,46 @@ rm -rf $RPM_BUILD_ROOT
 install -d \
        $RPM_BUILD_ROOT{%{_bindir},%{_pixmapsdir},%{_desktopdir}} \
        $RPM_BUILD_ROOT%{_libdir}/VirtualBox \
+       $RPM_BUILD_ROOT/etc/rc.d/init.d \
        $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers \
        $RPM_BUILD_ROOT%{_libdir}/xorg/modules/input
 
-install %{SOURCE4} $RPM_BUILD_ROOT%{_libdir}/VirtualBox/VirtualBox-wrapper.sh
+install %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/virtualbox
+
+install %{SOURCE5} $RPM_BUILD_ROOT%{_libdir}/VirtualBox/VirtualBox-wrapper.sh
 for f in {VBox{BFE,Manage,SDL,SVC,XPCOMIPCD},VirtualBox,vditool}; do
-       install out/linux.%{_outdir}/release/bin/$f $RPM_BUILD_ROOT%{_libdir}/VirtualBox/$f
+       install out/linux.%{outdir}/release/bin/$f $RPM_BUILD_ROOT%{_libdir}/VirtualBox/$f
        ln -s %{_libdir}/VirtualBox/VirtualBox-wrapper.sh $RPM_BUILD_ROOT%{_bindir}/$f
 done
 
-install out/linux.%{_outdir}/release/bin/VBox*.so \
+%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} \
+install out/linux.%{outdir}/release/bin/{VBox{DD,DD2}{GC.gc,R0.r0},VMM{GC.gc,R0.r0},*.xpt} \
        $RPM_BUILD_ROOT%{_libdir}/VirtualBox
 
 install -d $RPM_BUILD_ROOT%{_libdir}/VirtualBox/additions
 install -d $RPM_BUILD_ROOT%{_libdir}/VirtualBox/nls
 
 install %{SOURCE2} $RPM_BUILD_ROOT%{_libdir}/VirtualBox/additions/VBoxGuestAdditions.iso
-cp -a out/linux.%{_outdir}/release/bin/components $RPM_BUILD_ROOT%{_libdir}/VirtualBox
-cp -a out/linux.%{_outdir}/release/bin/nls/* $RPM_BUILD_ROOT%{_libdir}/VirtualBox/nls
+cp -a out/linux.%{outdir}/release/bin/components $RPM_BUILD_ROOT%{_libdir}/VirtualBox
+cp -a out/linux.%{outdir}/release/bin/nls/* $RPM_BUILD_ROOT%{_libdir}/VirtualBox/nls
 
-install out/linux.%{_outdir}/release/bin/additions/mountvboxsf         \
+install out/linux.%{outdir}/release/bin/additions/mountvboxsf          \
        $RPM_BUILD_ROOT%{_bindir}
 
-install out/linux.%{_outdir}/release/bin/additions/vboxmouse_drv_71.so \
+install out/linux.%{outdir}/release/bin/additions/vboxmouse_drv_14.so  \
        $RPM_BUILD_ROOT%{_libdir}/xorg/modules/input/vboxmouse_drv.so
 
-install out/linux.%{_outdir}/release/bin/additions/vboxvideo_drv_71.so \
+install out/linux.%{outdir}/release/bin/additions/vboxvideo_drv_14.so  \
        $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so
 
-install out/linux.%{_outdir}/release/bin/VBox.png $RPM_BUILD_ROOT%{_pixmapsdir}/VBox.png
-install %{SOURCE3} $RPM_BUILD_ROOT%{_desktopdir}/%{name}.desktop
+install out/linux.%{outdir}/release/bin/VBox.png $RPM_BUILD_ROOT%{_pixmapsdir}/VBox.png
+install %{SOURCE4} $RPM_BUILD_ROOT%{_desktopdir}/%{name}.desktop
 %endif
 
 %if %{with kernel}
@@ -351,6 +386,7 @@ fi
 %dir %{_libdir}/VirtualBox/additions
 %dir %{_libdir}/VirtualBox/components
 %dir %{_libdir}/VirtualBox/nls
+%attr(754,root,root) /etc/rc.d/init.d/virtualbox
 %attr(755,root,root) %{_bindir}/mountvboxsf
 %attr(755,root,root) %{_bindir}/vditool
 %attr(755,root,root) %{_bindir}/VBox*
@@ -362,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
@@ -392,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
@@ -411,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