X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=VirtualBox.spec;h=e9859c53d36e8998174a2bcb8ef083659b03b72e;hb=98c62750703940843056724df552143f389a3b01;hp=fd4782b63ebed76f49551f237667fed3979e090e;hpb=1067d08d0f72d8262ae8d3cf6c38aa534009dff5;p=packages%2FVirtualBox.git diff --git a/VirtualBox.spec b/VirtualBox.spec index fd4782b..e9859c5 100644 --- a/VirtualBox.spec +++ b/VirtualBox.spec @@ -27,22 +27,22 @@ %define _enable_debug_packages 0 %endif -%define rel 1 +%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.2.6 +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: 65b822ab3c08ff882d9621101996dc14 +# Source0-md5: 5aad764cd4e886f9d80d7bde42163c7a Source1: http://download.virtualbox.org/virtualbox/%{version}/UserManual.pdf -# Source1-md5: 8891557360f816f7604d26aac7503489 +# Source1-md5: 370bb3e893acffa584536c8f9e966c79 Source2: http://download.virtualbox.org/virtualbox/%{version}/VBoxGuestAdditions_%{version}.iso -# Source2-md5: 9542cf2fb93e1921a860930ac2a1d0de +# Source2-md5: 4fde0f279854334b84c01972fbed2874 Source3: %{pname}-vboxdrv.init Source4: %{pname}-vboxguest.init Source5: %{pname}-vboxnetflt.init @@ -50,11 +50,14 @@ 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 -Patch4: %{pname}-warning_workaround.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.535 %if %{with userspace} @@ -89,6 +92,7 @@ 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 @@ -112,7 +116,7 @@ Requires(post,preun): /sbin/chkconfig Requires(postun): /usr/sbin/groupdel Requires(pre): /usr/bin/getgid Requires(pre): /usr/sbin/groupadd -Requires: QtCore >= 4.6.1 +Requires: QtCore >= 4.7.0 Suggests: gxmessage Provides: group(vbox) ExclusiveArch: %{ix86} %{x8664} @@ -175,14 +179,13 @@ 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. +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. @@ -202,8 +205,8 @@ You should install this package in your Host OS. %package guest Summary: VirtualBox Guest Additions Group: Base -Requires: kernel%{_alt_kernel}-misc-vboxsf = %{version}-%{release} -Requires: kernel%{_alt_kernel}-misc-vboxvideo = %{version}-%{release} +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} @@ -222,6 +225,44 @@ Group: Base 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 @@ -240,6 +281,8 @@ 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. @@ -260,6 +303,8 @@ 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. @@ -281,6 +326,8 @@ 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. @@ -302,6 +349,8 @@ 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. @@ -324,6 +373,8 @@ Obsoletes: kernel%{_alt_kernel}-misc-vboxvfs %description -n kernel%{_alt_kernel}-misc-vboxsf Host file system access (Shared Folders) for VirtualBox OSE. +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. @@ -347,48 +398,11 @@ 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 -%if "%{pld_release}" == "ti" -Requires: xorg-xserver-server(xinput-abi) <= 7.0 -%else -Requires: xorg-xserver-server(xinput-abi) <= 9.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 -Release: %{rel} -Group: X11/Applications -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) <= 7.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. - %prep %setup -q -n %{pname}-%{version}_OSE %patch0 -p1 @@ -396,27 +410,27 @@ Sterownik grafiki dla systemu gościa w VirtualBoksie OSE. %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", GROUP="vbox", MODE="0660" -KERNEL=="vboxguest", GROUP="vbox", MODE="0660" -KERNEL=="vboxnetctl", 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}" \ @@ -428,15 +442,17 @@ kmk -j1 %{?with_verbose:KBUILD_VERBOSE=3} USER=$(id -un) %endif %if %{with kernel} -cd PLD-MODULE-BUILD +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 + +cd ../GuestDrivers %build_kernel_modules -m vboxguest -C vboxguest -%build_kernel_modules -m vboxdrv -C .vbox_modules/vboxdrv -%build_kernel_modules -m vboxnetadp -C .vbox_modules/vboxnetadp -%build_kernel_modules -m vboxnetflt -C .vbox_modules/vboxnetflt 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 @@ -470,8 +486,8 @@ mv $RPM_BUILD_ROOT{%{_libdir}/%{pname},%{_desktopdir}}/virtualbox.desktop 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_18.so,%{_libdir}/xorg/modules/input/vboxmouse_drv.so} -mv $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions/vboxvideo_drv_18.so,%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so} +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 @@ -487,7 +503,7 @@ 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 @@ -527,12 +543,12 @@ 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/vboxsf install -p %{SOURCE7} $RPM_BUILD_ROOT/etc/rc.d/init.d/vboxnetadp -%install_kernel_modules -m PLD-MODULE-BUILD/.vbox_modules/vboxdrv/vboxdrv -d misc -%install_kernel_modules -m PLD-MODULE-BUILD/vboxguest/vboxguest -d misc -%install_kernel_modules -m PLD-MODULE-BUILD/.vbox_modules/vboxnetadp/vboxnetadp -d misc -%install_kernel_modules -m PLD-MODULE-BUILD/.vbox_modules/vboxnetflt/vboxnetflt -d misc -%install_kernel_modules -m PLD-MODULE-BUILD/vboxsf/vboxsf -d misc -%install_kernel_modules -m PLD-MODULE-BUILD/vboxvideo_drm/vboxvideo -d misc +%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 @@ -727,6 +743,7 @@ fi %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 @@ -749,6 +766,9 @@ fi %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