X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=VirtualBox.spec;h=e9859c53d36e8998174a2bcb8ef083659b03b72e;hb=98c62750703940843056724df552143f389a3b01;hp=1d24e4e343f1fa504c8fc08960b382f80a640f99;hpb=0b6de2b731f3e233d1cb608c40837974e0b9cbc6;p=packages%2FVirtualBox.git diff --git a/VirtualBox.spec b/VirtualBox.spec index 1d24e4e..e9859c5 100644 --- a/VirtualBox.spec +++ b/VirtualBox.spec @@ -27,33 +27,39 @@ %define _enable_debug_packages 0 %endif -%define rel 2 -%define pname VirtualBox +%define rel 6 +%define pname VirtualBox + Summary: VirtualBox OSE - x86 hardware virtualizer Summary(pl.UTF-8): VirtualBox OSE - wirtualizator sprzętu x86 Name: %{pname}%{_alt_kernel} -Version: 3.1.2 +Version: 3.2.10 Release: %{rel} License: GPL v2 Group: Applications/Emulators Source0: http://download.virtualbox.org/virtualbox/%{version}/%{pname}-%{version}-OSE.tar.bz2 -# Source0-md5: e7808f16114f5b1a65aa2df1aa33e1a7 +# Source0-md5: 5aad764cd4e886f9d80d7bde42163c7a Source1: http://download.virtualbox.org/virtualbox/%{version}/UserManual.pdf -# Source1-md5: 052357bb684515035b3e561b35a1d6f2 +# Source1-md5: 370bb3e893acffa584536c8f9e966c79 Source2: http://download.virtualbox.org/virtualbox/%{version}/VBoxGuestAdditions_%{version}.iso -# Source2-md5: d1ac5c53fb889338849134e07a6bc16f +# Source2-md5: 4fde0f279854334b84c01972fbed2874 Source3: %{pname}-vboxdrv.init Source4: %{pname}-vboxguest.init Source5: %{pname}-vboxnetflt.init -Source6: %{pname}-vboxvfs.init +Source6: %{pname}-vboxsf.init +Source7: %{pname}-vboxnetadp.init Source8: %{pname}.sh Source9: mount.vdi -Patch0: %{pname}-configure.patch -Patch1: %{pname}-configure-spaces.patch -Patch2: %{pname}-export_modules.patch -Patch3: %{pname}-VBoxSysInfo.patch +Source10: udev.rules +Patch0: %{pname}-configure-spaces.patch +Patch1: %{pname}-export_modules.patch +Patch2: %{pname}-VBoxSysInfo.patch +Patch3: %{pname}-warning_workaround.patch +Patch4: %{pname}-vnc.patch +Patch5: %{pname}-noorigin.patch +Patch6: %{pname}-dri.patch URL: http://www.virtualbox.org/ -BuildRequires: rpmbuild(macros) >= 1.379 +BuildRequires: rpmbuild(macros) >= 1.535 %if %{with userspace} %ifarch %{x8664} BuildRequires: gcc-multilib @@ -86,9 +92,11 @@ BuildRequires: libpng-devel >= 1.2.5 BuildRequires: libstdc++-devel >= 5:3.2.3 BuildRequires: libstdc++-static >= 5:3.2.3 BuildRequires: libuuid-devel +BuildRequires: libvncserver-devel BuildRequires: libxml2-devel >= 2.6.26 BuildRequires: libxslt-devel >= 1.1.17 BuildRequires: libxslt-progs >= 1.1.17 +BuildRequires: pam-devel BuildRequires: pkgconfig BuildRequires: pulseaudio-devel >= 0.9.0 BuildRequires: python-devel @@ -108,20 +116,22 @@ Requires(post,preun): /sbin/chkconfig Requires(postun): /usr/sbin/groupdel Requires(pre): /usr/bin/getgid Requires(pre): /usr/sbin/groupadd +Requires: QtCore >= 4.7.0 Suggests: gxmessage Provides: group(vbox) ExclusiveArch: %{ix86} %{x8664} BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %ifarch %{x8664} -%define outdir amd64 +%define vbox_platform linux.amd64 %else -%define outdir x86 +%define vbox_platform linux.x86 %endif +%define outdir out/%{vbox_platform}/release/bin %define _sbindir /sbin %description -InnoTek VirtualBox OSE is a general-purpose full virtualizer for x86 +Oracle VirtualBox OSE is a general-purpose full virtualizer for x86 hardware. Targeted at server, desktop and embedded use, it is now the only professional-quality virtualization solution that is also Open Source Software. @@ -142,8 +152,10 @@ virtual machines are stored entirely in XML and are independent of the local machines. Virtual machine definitions can therefore easily be ported to other computers. +You should install this package in your Host OS. + %description -l pl.UTF-8 -InnoTek VirtualBox OSE jest emulatorem sprzętu x86. Kierowany do +Oracle VirtualBox OSE jest emulatorem sprzętu x86. Kierowany do zastosowań serwerowych, desktopowych oraz wbudowanych jest obecnie jedynym wysokiej jakości rozwiązaniem wirtualizacyjnym dostępnym również jako Otwarte Oprogramowanie. @@ -167,13 +179,14 @@ konfigurację maszyny wirtualnej na inny komputer. %package udev Summary: udev rules for VirtualBox OSE kernel modules Summary(pl.UTF-8): Reguły udev dla modułów jądra Linuksa dla VirtualBoksa -Release: %{rel} Group: Base/Kernel Requires: udev-core %description udev udev rules for VirtualBox OSE kernel modules. +You should install this package in your Host OS and in Guest OS. + %description udev -l pl.UTF-8 Reguły udev dla modułów jądra Linuksa dla VirtualBoksa. @@ -187,6 +200,69 @@ VirtualBox Guest Additions. This package contains ISO9660 image with drivers for Guest OS. +You should install this package in your Host OS. + +%package guest +Summary: VirtualBox Guest Additions +Group: Base +Suggests: kernel%{_alt_kernel}-misc-vboxsf = %{version}-%{rel}@%{_kernel_ver_str} +Suggests: kernel%{_alt_kernel}-misc-vboxvideo = %{version}-%{rel}@%{_kernel_ver_str} +Requires: xorg-driver-input-vboxmouse = %{version}-%{release} +Requires: xorg-driver-video-vboxvideo = %{version}-%{release} + +%description guest +Tools that utilize kernel modules for supporting integration with the +Host, including file sharing and tracking of mouse pointer movement +and X.org X11 video and mouse driver. + +You should install this package in your Guest OS. + +%package -n pam-pam_vbox +Summary: PAM module to perform automated guest logons +Group: Base + +%description -n pam-pam_vbox +PAM module (Pluggable Authentication Module) which can be used to +perform automated guest logons. + +%package -n xorg-driver-input-vboxmouse +Summary: X.org mouse driver for VirtualBox OSE guest OS +Summary(pl.UTF-8): Sterownik myszy dla systemu gościa w VirtualBoksie OSE +Group: X11/Applications +Requires: xorg-xserver-server >= 1.0.99.901 +%if "%{pld_release}" == "ti" +Requires: xorg-xserver-server(xinput-abi) <= 7.0 +%else +Requires: xorg-xserver-server(xinput-abi) <= 11.0 +%endif +Requires: xorg-xserver-server(xinput-abi) >= 4.0 + +%description -n xorg-driver-input-vboxmouse +X.org mouse driver for VirtualBox OSE guest OS. + +%description -n xorg-driver-input-vboxmouse -l pl.UTF-8 +Sterownik myszy dla systemu gościa w VirtualBoksie. + +%package -n xorg-driver-video-vboxvideo +Summary: X.org video driver for VirtualBox OSE guest OS +Summary(pl.UTF-8): Sterownik grafiki dla systemu gościa w VirtualBoksie OSE +Group: X11/Applications +Requires: Mesa-dri-driver-swrast +Requires: xorg-xserver-libdri >= 1.7.4 +Requires: xorg-xserver-server >= 1.0.99.901 +%if "%{pld_release}" == "ti" +Requires: xorg-xserver-server(videodrv-abi) <= 6.0 +%else +Requires: xorg-xserver-server(videodrv-abi) <= 8.0 +%endif +Requires: xorg-xserver-server(videodrv-abi) >= 2.0 + +%description -n xorg-driver-video-vboxvideo +X.org video driver for VirtualBox OSE guest OS. + +%description -n xorg-driver-video-vboxvideo -l pl.UTF-8 +Sterownik grafiki dla systemu gościa w VirtualBoksie OSE. + %package -n kernel%{_alt_kernel}-misc-vboxguest Summary: VirtualBox OSE Guest Additions for Linux Module Summary(pl.UTF-8): Moduł jądra Linuksa dla VirtualBoksa OSE @@ -200,13 +276,16 @@ Requires(postun): %releq_kernel %endif Provides: kernel(vboxguest) = %{version}-%{rel} Obsoletes: kernel%{_alt_kernel}-misc-vboxadd +Conflicts: kernel%{_alt_kernel}-misc-vboxdrv %description -n kernel%{_alt_kernel}-misc-vboxguest VirtualBox OSE Guest Additions for Linux Module. +You should install this package in your Guest OS. + %description -n kernel%{_alt_kernel}-misc-vboxguest -l pl.UTF-8 -Moduł jądra Linuksa vboxguest dla VirtualBoksa OSE - dodatki dla systemu -gościa. +Moduł jądra Linuksa vboxguest dla VirtualBoksa OSE - dodatki dla +systemu gościa. %package -n kernel%{_alt_kernel}-misc-vboxdrv Summary: VirtualBox OSE Support Driver @@ -224,12 +303,37 @@ Provides: kernel(vboxdrv) = %{version}-%{rel} %description -n kernel%{_alt_kernel}-misc-vboxdrv VirtualBox OSE Support Driver. +You should install this package in your Host OS. + %description -n kernel%{_alt_kernel}-misc-vboxdrv -l pl.UTF-8 Moduł jądra Linuksa dla VirtualBoksa OSE - sterownik wsparcia dla systemu głównego. +%package -n kernel%{_alt_kernel}-misc-vboxnetadp +Summary: VirtualBox OSE Network Adapter Driver +Summary(pl.UTF-8): Moduł jądra Linuksa dla VirtualBoksa OSE +Release: %{rel}@%{_kernel_ver_str} +Group: Base/Kernel +Requires(post,postun): /sbin/depmod +Requires: dev >= 2.9.0-7 +Requires: kernel%{_alt_kernel}-misc-vboxdrv +%if %{with dist_kernel} +%requires_releq_kernel +Requires(postun): %releq_kernel +%endif +Provides: kernel(vboxnetflt) = %{version}-%{rel} + +%description -n kernel%{_alt_kernel}-misc-vboxnetadp +VirtualBox OSE Network Adapter Driver. + +You should install this package in your Host OS. + +%description -n kernel%{_alt_kernel}-misc-vboxnetadp -l pl.UTF-8 +Moduł jądra Linuksa dla VirtualBoksa OSE - sterownik witrualnej karty +sieciowej. + %package -n kernel%{_alt_kernel}-misc-vboxnetflt -Summary: VirtualBox OSE Guest Additions for Linux Module +Summary: VirtualBox OSE Network Filter Driver Summary(pl.UTF-8): Moduł jądra Linuksa dla VirtualBoksa OSE Release: %{rel}@%{_kernel_ver_str} Group: Base/Kernel @@ -245,12 +349,14 @@ Provides: kernel(vboxnetflt) = %{version}-%{rel} %description -n kernel%{_alt_kernel}-misc-vboxnetflt VirtualBox OSE Network Filter Driver. +You should install this package in your Host OS. + %description -n kernel%{_alt_kernel}-misc-vboxnetflt -l pl.UTF-8 Moduł jądra Linuksa dla VirtualBoksa OSE - sterownik filtrowania sieci dla systemu głównego. -%package -n kernel%{_alt_kernel}-misc-vboxvfs -Summary: Host file system access VFS for VirtualBox OSE +%package -n kernel%{_alt_kernel}-misc-vboxsf +Summary: Host file system access (Shared Folders) for VirtualBox OSE Summary(pl.UTF-8): Moduł jądra Linuksa dla VirtualBoksa OSE Release: %{rel}@%{_kernel_ver_str} Group: Base/Kernel @@ -261,12 +367,15 @@ Requires: kernel%{_alt_kernel}-misc-vboxguest %requires_releq_kernel Requires(postun): %releq_kernel %endif -Provides: kernel(vboxvfs) = %{version}-%{rel} +Provides: kernel(vboxsf) = %{version}-%{rel} +Obsoletes: kernel%{_alt_kernel}-misc-vboxvfs -%description -n kernel%{_alt_kernel}-misc-vboxvfs -Host file system access VFS for VirtualBox OSE. +%description -n kernel%{_alt_kernel}-misc-vboxsf +Host file system access (Shared Folders) for VirtualBox OSE. -%description -n kernel%{_alt_kernel}-misc-vboxvfs -l pl.UTF-8 +You should install this package in your Guest OS. + +%description -n kernel%{_alt_kernel}-misc-vboxsf -l pl.UTF-8 Moduł jądra Linuksa dla VirtualBoksa OSE - dostęp do plików systemu głównego z poziomu systemu gościa. @@ -279,6 +388,9 @@ Requires(post,postun): /sbin/depmod Requires: dev >= 2.9.0-7 %if %{with dist_kernel} %requires_releq_kernel +%if "%{rpm_build_macros}" >= "1.531" +%requires_releq_kernel -n drm +%endif Requires(postun): %releq_kernel %endif Provides: kernel(vboxvideo) = %{version}-%{rel} @@ -286,65 +398,39 @@ Provides: kernel(vboxvideo) = %{version}-%{rel} %description -n kernel%{_alt_kernel}-misc-vboxvideo DRM support for VirtualBox OSE. +You should install this package in your Guest OS. + %description -n kernel%{_alt_kernel}-misc-vboxvideo -l pl.UTF-8 Moduł jądra Linuksa dla VirtualBoksa OSE - sterownik obsługi DRM. -%package -n xorg-driver-input-vboxmouse -Summary: X.org mouse driver for VirtualBox OSE guest OS -Summary(pl.UTF-8): Sterownik myszy dla systemu gościa w VirtualBoksie OSE -Release: %{rel} -Group: X11/Applications -Requires: xorg-xserver-server >= 1.0.99.901 -Requires: xorg-xserver-server(xinput-abi) <= 7.0 -Requires: xorg-xserver-server(xinput-abi) >= 4.0 - -%description -n xorg-driver-input-vboxmouse -X.org mouse driver for VirtualBox OSE guest OS. - -%description -n xorg-driver-input-vboxmouse -l pl.UTF-8 -Sterownik myszy dla systemu gościa w VirtualBoksie. - -%package -n xorg-driver-video-vboxvideo -Summary: X.org video driver for VirtualBox OSE guest OS -Summary(pl.UTF-8): Sterownik grafiki dla systemu gościa w VirtualBoksie OSE -Release: %{rel} -Group: X11/Applications -Requires: xorg-xserver-server >= 1.0.99.901 -Requires: xorg-xserver-server(videodrv-abi) <= 6.0 -Requires: xorg-xserver-server(videodrv-abi) >= 2.0 - -%description -n xorg-driver-video-vboxvideo -X.org video driver for VirtualBox OSE guest OS. - -%description -n xorg-driver-video-vboxvideo -l pl.UTF-8 -Sterownik grafiki dla systemu gościa w VirtualBoksie OSE. - %prep %setup -q -n %{pname}-%{version}_OSE %patch0 -p1 %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 +%patch5 -p0 +%patch6 -p1 %{__sed} -i -e 's,$VBOX_DOC_PATH,%{_docdir}/%{name}-%{version},' src/VBox/Installer/linux/virtualbox.desktop %{__sed} -i -e 's/Categories=.*/Categories=Utility;Emulator;/' src/VBox/Installer/linux/virtualbox.desktop -cat <<'EOF' > udev.conf -KERNEL=="vboxdrv", NAME="%k", GROUP="vbox", MODE="0660" -KERNEL=="vboxguest", NAME="%k", GROUP="vbox", MODE="0660" -EOF - cp -a %{SOURCE1} . sed 's#@LIBDIR@#%{_libdir}#' < %{SOURCE8} > VirtualBox-wrapper.sh -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 -../src/VBox/HostDrivers/linux/export_modules modules.tar.gz --without-hardening && \ - tar -zxf modules.tar.gz && rm -f modules.tar.gz +install -d PLD-MODULE-BUILD/{GuestDrivers,HostDrivers} +cd PLD-MODULE-BUILD +../src/VBox/Additions/linux/export_modules guest-modules.tar.gz +tar -zxf guest-modules.tar.gz -C GuestDrivers + +../src/VBox/HostDrivers/linux/export_modules host-modules.tar.gz --without-hardening +tar -zxf host-modules.tar.gz -C HostDrivers +cd - %build %if %{with userspace} +echo "VBOX_WITH_TESTCASES := " > LocalConfig.kmk ./configure \ --with-gcc="%{__cc}" \ --with-g++="%{__cxx}" \ @@ -356,14 +442,17 @@ kmk -j1 %{?with_verbose:KBUILD_VERBOSE=3} USER=$(id -un) %endif %if %{with kernel} -cd PLD-MODULE-BUILD -%build_kernel_modules -m vboxguest -C vboxguest +cd PLD-MODULE-BUILD/HostDrivers %build_kernel_modules -m vboxdrv -C vboxdrv +%build_kernel_modules -m vboxnetadp -C vboxnetadp %build_kernel_modules -m vboxnetflt -C vboxnetflt -cp -a vboxguest/Module.symvers vboxvfs -%build_kernel_modules -m vboxvfs -C vboxvfs -c + +cd ../GuestDrivers +%build_kernel_modules -m vboxguest -C vboxguest +cp -a vboxguest/Module.symvers vboxsf +%build_kernel_modules -m vboxsf -C vboxsf -c %build_kernel_modules -m vboxvideo -C vboxvideo_drm -cd .. +cd ../.. %{__cc} %{rpmcflags} %{rpmldflags} -Wall -Werror src/VBox/Additions/linux/sharedfolders/mount.vboxsf.c -o mount.vboxsf %endif @@ -372,44 +461,79 @@ rm -rf $RPM_BUILD_ROOT %if %{with userspace} install -d \ - $RPM_BUILD_ROOT{%{_bindir},%{_sbindir},%{_pixmapsdir},%{_desktopdir}} \ - $RPM_BUILD_ROOT%{_libdir}/VirtualBox \ + $RPM_BUILD_ROOT{%{_bindir},%{_sbindir},%{_libdir},%{_pixmapsdir},%{_desktopdir}} \ + $RPM_BUILD_ROOT%{_libdir}/xorg/modules/{drivers,dri,input} -install -p %{SOURCE9} $RPM_BUILD_ROOT%{_sbindir}/mount.vdi -install -p VirtualBox-wrapper.sh $RPM_BUILD_ROOT%{_libdir}/VirtualBox -for f in {VBox{BFE,Headless,Manage,SDL,SVC,Tunctl,XPCOMIPCD},VirtualBox}; do - install -p 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 -p out/linux.%{outdir}/release/bin/VBox{TestOGL,NetAdpCtl,NetDHCP} \ - $RPM_BUILD_ROOT%{_libdir}/VirtualBox -install -p out/linux.%{outdir}/release/bin/VBox*.so \ - $RPM_BUILD_ROOT%{_libdir}/VirtualBox -install -p out/linux.%{outdir}/release/bin/{VBox{DD,DD2}{GC.gc,R0.r0},VMM{GC.gc,R0.r0}} \ - $RPM_BUILD_ROOT%{_libdir}/VirtualBox -install -p out/linux.%{outdir}/release/bin/VBoxSysInfo.sh \ - $RPM_BUILD_ROOT%{_libdir}/VirtualBox +# test if we can hardlink -- %{_builddir} and $RPM_BUILD_ROOT on same partition +if cp -al VBox.png $RPM_BUILD_ROOT/Vbox.png 2>/dev/null; then + l=l + rm -f $RPM_BUILD_ROOT/VBox.png +fi -install -d $RPM_BUILD_ROOT%{_libdir}/VirtualBox/additions -install -d $RPM_BUILD_ROOT%{_libdir}/VirtualBox/nls +cp -a$l %{outdir} $RPM_BUILD_ROOT%{_libdir}/%{pname} cp -a %{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 - -install -d $RPM_BUILD_ROOT%{_libdir}/xorg/modules/{drivers,input} +install -p %{SOURCE9} $RPM_BUILD_ROOT%{_sbindir}/mount.vdi +install -p VirtualBox-wrapper.sh $RPM_BUILD_ROOT%{_libdir}/%{pname} +for f in {VBox{BFE,Headless,Manage,SDL,SVC,Tunctl,XPCOMIPCD},VirtualBox}; do + ln -s %{_libdir}/%{pname}/VirtualBox-wrapper.sh $RPM_BUILD_ROOT%{_bindir}/$f +done -install -p out/linux.%{outdir}/release/bin/additions/vboxmouse_drv_17.so \ - $RPM_BUILD_ROOT%{_libdir}/xorg/modules/input/vboxmouse_drv.so -install -p out/linux.%{outdir}/release/bin/additions/vboxvideo_drv_17.so \ - $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so +mv $RPM_BUILD_ROOT{%{_libdir}/%{pname},%{_pixmapsdir}}/VBox.png +mv $RPM_BUILD_ROOT{%{_libdir}/%{pname},%{_desktopdir}}/virtualbox.desktop -install -p out/linux.%{outdir}/release/bin/VBox.png $RPM_BUILD_ROOT%{_pixmapsdir}/VBox.png -cp -a out/linux.%{outdir}/release/bin/virtualbox.desktop $RPM_BUILD_ROOT%{_desktopdir}/%{pname}.desktop +%if "%{pld_release}" == "ti" +mv $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions/vboxmouse_drv_17.so,%{_libdir}/xorg/modules/input/vboxmouse_drv.so} +mv $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions/vboxvideo_drv_17.so,%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so} +%else +mv $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions/vboxmouse_drv_19.so,%{_libdir}/xorg/modules/input/vboxmouse_drv.so} +mv $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions/vboxvideo_drv_19.so,%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so} +%endif +mv $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions/VBoxOGL.so,%{_libdir}/xorg/modules/dri/vboxvideo_dri.so} +# xorg other driver versions +rm -vf $RPM_BUILD_ROOT%{_libdir}/%{pname}/additions/vboxmouse_drv*.{o,so} +rm -vf $RPM_BUILD_ROOT%{_libdir}/%{pname}/additions/vboxvideo_drv*.{o,so} + +# XXX: where else to install them that vboxvideo_dri.so finds them? patch with rpath? +mv $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions,%{_libdir}}/VBoxOGLarrayspu.so +mv $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions,%{_libdir}}/VBoxOGLcrutil.so +mv $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions,%{_libdir}}/VBoxOGLerrorspu.so +mv $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions,%{_libdir}}/VBoxOGLfeedbackspu.so +mv $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions,%{_libdir}}/VBoxOGLpackspu.so +mv $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions,%{_libdir}}/VBoxOGLpassthroughspu.so install -d $RPM_BUILD_ROOT/etc/udev/rules.d -cp -a udev.conf $RPM_BUILD_ROOT/etc/udev/rules.d/virtualbox.rules +cp -a %{SOURCE10} $RPM_BUILD_ROOT/etc/udev/rules.d/virtualbox.rules + +install -d $RPM_BUILD_ROOT/%{_lib}/security +mv $RPM_BUILD_ROOT{%{_libdir}/VirtualBox/additions,/%{_lib}/security}/pam_vbox.so + +# cleanup unpackaged +rm -r $RPM_BUILD_ROOT%{_libdir}/%{pname}/{src,sdk,testcase} +rm -r $RPM_BUILD_ROOT%{_libdir}/%{pname}/additions/src +rm $RPM_BUILD_ROOT%{_libdir}/%{pname}/vboxkeyboard.tar.bz2 +rm $RPM_BUILD_ROOT%{_libdir}/%{pname}/tst* + +# IPRT Testcase / Tool - Source Code Massager. +rm $RPM_BUILD_ROOT%{_libdir}/%{pname}/scm + +# Guest Only Tools +mv $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions,%{_bindir}}/VBoxService + +# unknown - checkme +%if 1 +rm $RPM_BUILD_ROOT%{_libdir}/%{pname}/SUPInstall +rm $RPM_BUILD_ROOT%{_libdir}/%{pname}/SUPLoggerCtl +rm $RPM_BUILD_ROOT%{_libdir}/%{pname}/SUPUninstall +rm $RPM_BUILD_ROOT%{_libdir}/%{pname}/VBox.sh +rm $RPM_BUILD_ROOT%{_libdir}/%{pname}/additions/VBoxClient +rm $RPM_BUILD_ROOT%{_libdir}/%{pname}/additions/VBoxControl +rm $RPM_BUILD_ROOT%{_libdir}/%{pname}/vboxshell.py +rm $RPM_BUILD_ROOT%{_libdir}/%{pname}/xpidl +%endif + +# packaged by kernel part +rm $RPM_BUILD_ROOT%{_libdir}/%{pname}/additions/mount.vboxsf %endif %if %{with kernel} @@ -417,19 +541,17 @@ install -d $RPM_BUILD_ROOT{/etc/{rc.d/init.d,modprobe.d},%{_sbindir}} install -p %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/vboxdrv install -p %{SOURCE4} $RPM_BUILD_ROOT/etc/rc.d/init.d/vboxguest install -p %{SOURCE5} $RPM_BUILD_ROOT/etc/rc.d/init.d/vboxnetflt -install -p %{SOURCE6} $RPM_BUILD_ROOT/etc/rc.d/init.d/vboxvfs -%install_kernel_modules -m PLD-MODULE-BUILD/vboxdrv/vboxdrv -d misc -%install_kernel_modules -m PLD-MODULE-BUILD/vboxguest/vboxguest -d misc -%install_kernel_modules -m PLD-MODULE-BUILD/vboxnetflt/vboxnetflt -d misc -%install_kernel_modules -m PLD-MODULE-BUILD/vboxvfs/vboxvfs -d misc -%install_kernel_modules -m PLD-MODULE-BUILD/vboxvideo_drm/vboxvideo -d misc +install -p %{SOURCE6} $RPM_BUILD_ROOT/etc/rc.d/init.d/vboxsf +install -p %{SOURCE7} $RPM_BUILD_ROOT/etc/rc.d/init.d/vboxnetadp +%install_kernel_modules -m PLD-MODULE-BUILD/HostDrivers/vboxdrv/vboxdrv -d misc +%install_kernel_modules -m PLD-MODULE-BUILD/HostDrivers/vboxnetadp/vboxnetadp -d misc +%install_kernel_modules -m PLD-MODULE-BUILD/HostDrivers/vboxnetflt/vboxnetflt -d misc +%install_kernel_modules -m PLD-MODULE-BUILD/GuestDrivers/vboxguest/vboxguest -d misc +%install_kernel_modules -m PLD-MODULE-BUILD/GuestDrivers/vboxsf/vboxsf -d misc +%install_kernel_modules -m PLD-MODULE-BUILD/GuestDrivers/vboxvideo_drm/vboxvideo -d misc install -p mount.vboxsf $RPM_BUILD_ROOT%{_sbindir}/mount.vboxsf -cat <<'EOF' > $RPM_BUILD_ROOT/etc/modprobe.d/vboxvfs.conf -# Filesystem name has got it's name from Shared Folders, while module is from VFS -alias vboxsf vboxvfs -EOF %endif %clean @@ -440,25 +562,18 @@ rm -rf $RPM_BUILD_ROOT %post cat << 'EOF' -You must also install kernel module for this software to work: +You must install vboxdrv kernel module for this software to work: kernel-misc-vboxdrv-%{version}-%{rel}@%{_kernel_ver_str} Additionally you might want to install: + kernel-misc-vboxnetadp-%{version}-%{rel}@%{_kernel_ver_str} kernel-misc-vboxnetflt-%{version}-%{rel}@%{_kernel_ver_str} On Guest Linux system you might want to install: kernel-misc-vboxguest-%{version}-%{rel}@%{_kernel_ver_str} - kernel-misc-vboxvfs-%{version}-%{rel}@%{_kernel_ver_str} + kernel-misc-vboxsf-%{version}-%{rel}@%{_kernel_ver_str} kernel-misc-vboxvideo-%{version}-%{rel}@%{_kernel_ver_str} -NOTE: for different kernel brands append after word kernel the brand, like: - kernel-desktop-misc-vboxdrv-%{version}-%{rel}@%{_kernel_ver_str} - kernel-laptop-misc-vboxdrv-%{version}-%{rel}@%{_kernel_ver_str} - kernel-vanilla-misc-vboxdrv-%{version}-%{rel}@%{_kernel_ver_str} - ...etc. - -Depending on which kernel brand You use. - EOF %postun @@ -494,6 +609,20 @@ if [ "$1" = "0" ]; then /sbin/chkconfig --del vboxdrv fi +%post -n kernel%{_alt_kernel}-misc-vboxnetadp +%depmod %{_kernel_ver} +/sbin/chkconfig --add vboxnetadp +%service vboxnetadp restart "VirtualBox OSE Network HostOnly driver" + +%postun -n kernel%{_alt_kernel}-misc-vboxnetadp +%depmod %{_kernel_ver} + +%preun -n kernel%{_alt_kernel}-misc-vboxnetadp +if [ "$1" = "0" ]; then + %service vboxnetadp stop + /sbin/chkconfig --del vboxnetadp +fi + %post -n kernel%{_alt_kernel}-misc-vboxnetflt %depmod %{_kernel_ver} /sbin/chkconfig --add vboxnetflt @@ -508,18 +637,18 @@ if [ "$1" = "0" ]; then /sbin/chkconfig --del vboxnetflt fi -%post -n kernel%{_alt_kernel}-misc-vboxvfs +%post -n kernel%{_alt_kernel}-misc-vboxsf %depmod %{_kernel_ver} -/sbin/chkconfig --add vboxvfs -%service vboxvfs restart "VirtualBox OSE Host file system access VFS" +/sbin/chkconfig --add vboxsf +%service vboxsf restart "VirtualBox OSE Host file system access (Shared Folders)" -%postun -n kernel%{_alt_kernel}-misc-vboxvfs +%postun -n kernel%{_alt_kernel}-misc-vboxsf %depmod %{_kernel_ver} -%preun -n kernel%{_alt_kernel}-misc-vboxvfs +%preun -n kernel%{_alt_kernel}-misc-vboxsf if [ "$1" = "0" ]; then - %service vboxvfs stop - /sbin/chkconfig --del vboxvfs + %service vboxsf stop + /sbin/chkconfig --del vboxsf fi %post -n kernel%{_alt_kernel}-misc-vboxvideo @@ -544,7 +673,7 @@ fi %attr(755,root,root) %{_bindir}/VBoxTunctl %attr(755,root,root) %{_bindir}/VBoxXPCOMIPCD %attr(755,root,root) %{_bindir}/VirtualBox -%attr(755,root,root) /sbin/mount.vdi +%attr(755,root,root) %{_sbindir}/mount.vdi %attr(755,root,root) %{_libdir}/VirtualBox/VBoxSVC %attr(755,root,root) %{_libdir}/VirtualBox/VBoxBFE %attr(755,root,root) %{_libdir}/VirtualBox/VBoxHeadless @@ -556,6 +685,7 @@ fi %attr(755,root,root) %{_libdir}/VirtualBox/VBoxDD.so %attr(755,root,root) %{_libdir}/VirtualBox/VBoxDD2.so %attr(755,root,root) %{_libdir}/VirtualBox/VBoxDDU.so +%attr(755,root,root) %{_libdir}/VirtualBox/VBoxGuestControlSvc.so %attr(755,root,root) %{_libdir}/VirtualBox/VBoxGuestPropSvc.so %attr(755,root,root) %{_libdir}/VirtualBox/VBoxKeyboard.so %attr(755,root,root) %{_libdir}/VirtualBox/VBoxNetAdpCtl @@ -563,8 +693,7 @@ fi %attr(755,root,root) %{_libdir}/VirtualBox/VBoxOGLhostcrutil.so %attr(755,root,root) %{_libdir}/VirtualBox/VBoxOGLhosterrorspu.so %attr(755,root,root) %{_libdir}/VirtualBox/VBoxOGLrenderspu.so -%attr(755,root,root) %{_libdir}/VirtualBox/VBoxPython.so -%attr(755,root,root) %{_libdir}/VirtualBox/VBoxPython2_6.so +%attr(755,root,root) %{_libdir}/VirtualBox/VBoxPython*.so %attr(755,root,root) %{_libdir}/VirtualBox/VBoxREM.so %ifarch %{ix86} %attr(755,root,root) %{_libdir}/VirtualBox/VBoxREM32.so @@ -586,28 +715,35 @@ fi %{_libdir}/VirtualBox/VBoxDD2R0.r0 %{_libdir}/VirtualBox/VBoxDDR0.r0 %{_libdir}/VirtualBox/VMMR0.r0 -%{_libdir}/VirtualBox/components/VBoxC.so -%{_libdir}/VirtualBox/components/VBoxSVCM.so +%{_libdir}/VirtualBox/EfiThunk +%{_libdir}/VirtualBox/VBoxEFI32.fd +%{_libdir}/VirtualBox/VBoxEFI64.fd %{_libdir}/VirtualBox/components/VBoxXPCOMBase.xpt -%{_libdir}/VirtualBox/components/VBoxXPCOMIPCC.so %{_libdir}/VirtualBox/components/VirtualBox_XPCOM.xpt +%attr(755,root,root) %{_libdir}/VirtualBox/components/VBoxC.so +%attr(755,root,root) %{_libdir}/VirtualBox/components/VBoxSVCM.so +%attr(755,root,root) %{_libdir}/VirtualBox/components/VBoxXPCOMIPCC.so %lang(ar) %{_libdir}/VirtualBox/nls/*_ar.qm %lang(bg) %{_libdir}/VirtualBox/nls/*_bg.qm %lang(ca) %{_libdir}/VirtualBox/nls/*_ca.qm +%lang(ca_VA) %{_libdir}/VirtualBox/nls/*_ca_VA.qm %lang(cs) %{_libdir}/VirtualBox/nls/*_cs.qm %lang(da) %{_libdir}/VirtualBox/nls/*_da.qm %lang(de) %{_libdir}/VirtualBox/nls/*_de.qm %lang(el) %{_libdir}/VirtualBox/nls/*_el.qm +%lang(en) %{_libdir}/VirtualBox/nls/*_en.qm %lang(es) %{_libdir}/VirtualBox/nls/*_es.qm %lang(eu) %{_libdir}/VirtualBox/nls/*_eu.qm %lang(fi) %{_libdir}/VirtualBox/nls/*_fi.qm %lang(fr) %{_libdir}/VirtualBox/nls/*_fr.qm +%lang(gl_ES) %{_libdir}/VirtualBox/nls/*_gl_ES.qm %lang(hu) %{_libdir}/VirtualBox/nls/*_hu.qm %lang(id) %{_libdir}/VirtualBox/nls/*_id.qm %lang(it) %{_libdir}/VirtualBox/nls/*_it.qm %lang(ja) %{_libdir}/VirtualBox/nls/*_ja.qm %lang(km_KH) %{_libdir}/VirtualBox/nls/*_km_KH.qm %lang(ko) %{_libdir}/VirtualBox/nls/*_ko.qm +%lang(lt) %{_libdir}/VirtualBox/nls/*_lt.qm %lang(nl) %{_libdir}/VirtualBox/nls/*_nl.qm %lang(pl) %{_libdir}/VirtualBox/nls/*_pl.qm %lang(pt) %{_libdir}/VirtualBox/nls/*_pt.qm @@ -622,11 +758,23 @@ fi %lang(zh_CN) %{_libdir}/VirtualBox/nls/*_zh_CN.qm %lang(zh_TW) %{_libdir}/VirtualBox/nls/*_zh_TW.qm %{_pixmapsdir}/VBox.png -%{_desktopdir}/%{pname}.desktop +%{_desktopdir}/*.desktop %files additions +%defattr(644,root,root,755) %{_libdir}/VirtualBox/additions/VBoxGuestAdditions.iso +%files guest +%defattr(644,root,root,755) +# NOTE: unfinished, should contain .desktop files for starting up mouse +# integration and other desktop services +# NOTE: the filelist is incopmplete too +%attr(755,root,root) %{_bindir}/VBoxService + +%files -n pam-pam_vbox +%defattr(644,root,root,755) +%attr(755,root,root) /%{_lib}/security/pam_vbox.so + %files udev %defattr(644,root,root,755) %config(noreplace) %verify(not md5 mtime size) /etc/udev/rules.d/virtualbox.rules @@ -638,6 +786,14 @@ fi %files -n xorg-driver-video-vboxvideo %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/xorg/modules/drivers/vboxvideo_drv.so +%attr(755,root,root) %{_libdir}/xorg/modules/dri/vboxvideo_dri.so +# vboxvideo_dri.so deps +%attr(755,root,root) %{_libdir}/VBoxOGLarrayspu.so +%attr(755,root,root) %{_libdir}/VBoxOGLcrutil.so +%attr(755,root,root) %{_libdir}/VBoxOGLerrorspu.so +%attr(755,root,root) %{_libdir}/VBoxOGLfeedbackspu.so +%attr(755,root,root) %{_libdir}/VBoxOGLpackspu.so +%attr(755,root,root) %{_libdir}/VBoxOGLpassthroughspu.so %endif %if %{with kernel} @@ -651,17 +807,21 @@ fi %attr(754,root,root) /etc/rc.d/init.d/vboxdrv /lib/modules/%{_kernel_ver}/misc/vboxdrv.ko* +%files -n kernel%{_alt_kernel}-misc-vboxnetadp +%defattr(644,root,root,755) +%attr(754,root,root) /etc/rc.d/init.d/vboxnetadp +/lib/modules/%{_kernel_ver}/misc/vboxnetadp.ko* + %files -n kernel%{_alt_kernel}-misc-vboxnetflt %defattr(644,root,root,755) %attr(754,root,root) /etc/rc.d/init.d/vboxnetflt /lib/modules/%{_kernel_ver}/misc/vboxnetflt.ko* -%files -n kernel%{_alt_kernel}-misc-vboxvfs +%files -n kernel%{_alt_kernel}-misc-vboxsf %defattr(644,root,root,755) -%attr(754,root,root) /etc/rc.d/init.d/vboxvfs +%attr(754,root,root) /etc/rc.d/init.d/vboxsf %attr(755,root,root) %{_sbindir}/mount.vboxsf -/etc/modprobe.d/vboxvfs.conf -/lib/modules/%{_kernel_ver}/misc/vboxvfs.ko* +/lib/modules/%{_kernel_ver}/misc/vboxsf.ko* %files -n kernel%{_alt_kernel}-misc-vboxvideo %defattr(644,root,root,755)