X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=VirtualBox.spec;h=e9859c53d36e8998174a2bcb8ef083659b03b72e;hb=98c62750703940843056724df552143f389a3b01;hp=7da1264c28f4d15b8693a662788f3d8c27a41ce9;hpb=3d8bc94ca247b12869ff182d51c30b33400efab4;p=packages%2FVirtualBox.git diff --git a/VirtualBox.spec b/VirtualBox.spec index 7da1264..e9859c5 100644 --- a/VirtualBox.spec +++ b/VirtualBox.spec @@ -27,22 +27,22 @@ %define _enable_debug_packages 0 %endif -%define rel 2 +%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.8 +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: 84de65bddb365ba61eddd3b112b303e5 +# Source0-md5: 5aad764cd4e886f9d80d7bde42163c7a Source1: http://download.virtualbox.org/virtualbox/%{version}/UserManual.pdf -# Source1-md5: 322feb471c55b81e95e0caecdc93efb0 +# Source1-md5: 370bb3e893acffa584536c8f9e966c79 Source2: http://download.virtualbox.org/virtualbox/%{version}/VBoxGuestAdditions_%{version}.iso -# Source2-md5: 023cc07b07e0b3850c5e8c354ddc6075 +# Source2-md5: 4fde0f279854334b84c01972fbed2874 Source3: %{pname}-vboxdrv.init Source4: %{pname}-vboxguest.init Source5: %{pname}-vboxnetflt.init @@ -51,11 +51,13 @@ Source7: %{pname}-vboxnetadp.init Source8: %{pname}.sh Source9: mount.vdi Source10: udev.rules -Patch0: %{pname}-configure.patch -Patch1: %{pname}-configure-spaces.patch -Patch2: %{pname}-export_modules.patch -Patch3: %{pname}-VBoxSysInfo.patch -Patch4: %{pname}-warning_workaround.patch +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} @@ -90,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 @@ -113,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} @@ -176,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. @@ -203,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} @@ -231,7 +233,7 @@ 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 +Requires: xorg-xserver-server(xinput-abi) <= 11.0 %endif Requires: xorg-xserver-server(xinput-abi) >= 4.0 @@ -245,12 +247,13 @@ Sterownik myszy dla systemu gościa w VirtualBoksie. 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) <= 7.0 +Requires: xorg-xserver-server(videodrv-abi) <= 8.0 %endif Requires: xorg-xserver-server(videodrv-abi) >= 2.0 @@ -407,6 +410,8 @@ Moduł jądra Linuksa dla VirtualBoksa OSE - sterownik obsługi DRM. %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 @@ -425,6 +430,7 @@ cd - %build %if %{with userspace} +echo "VBOX_WITH_TESTCASES := " > LocalConfig.kmk ./configure \ --with-gcc="%{__cc}" \ --with-g++="%{__cxx}" \ @@ -480,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 @@ -760,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