X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=VirtualBox.spec;h=0631862ce5fe4db25649f0c618975f296a0ccfad;hb=c0371a0b0850c8811a849358427234fb08cdbc6b;hp=a00a7692d82e94340e54abcbbbc10281da8eda0f;hpb=80ec693d6f6e8983b05a55ba6837393c74338230;p=packages%2FVirtualBox.git

diff --git a/VirtualBox.spec b/VirtualBox.spec
index a00a769..0631862 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -27,22 +27,22 @@
 %define		_enable_debug_packages	0
 %endif
 
-%define		rel		1
+%define		rel		2
 %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.12
 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:	4ba1d6c960691f60d1cbfc19c98294d6
 Source1:	http://download.virtualbox.org/virtualbox/%{version}/UserManual.pdf
-# Source1-md5:	8891557360f816f7604d26aac7503489
+# Source1-md5:	d7f8685fe5fd84757b33d46e6f0b6bc5
 Source2:	http://download.virtualbox.org/virtualbox/%{version}/VBoxGuestAdditions_%{version}.iso
-# Source2-md5:	9542cf2fb93e1921a860930ac2a1d0de
+# Source2-md5:	2f670cc8d4f85ff92257252f8de4d7c1
 Source3:	%{pname}-vboxdrv.init
 Source4:	%{pname}-vboxguest.init
 Source5:	%{pname}-vboxnetflt.init
@@ -51,11 +51,12 @@ 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}-dri.patch
 URL:		http://www.virtualbox.org/
 BuildRequires:	rpmbuild(macros) >= 1.535
 %if %{with userspace}
@@ -90,6 +91,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 +115,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 +178,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 +204,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}
 
@@ -229,9 +230,9 @@ 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
+Requires:	xorg-xserver-server(xinput-abi) <= 11.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 +246,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
+Requires:	xorg-xserver-server(videodrv-abi) <= 8.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
 
@@ -278,6 +280,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.
@@ -298,6 +302,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.
@@ -319,6 +325,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.
@@ -340,6 +348,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.
@@ -362,6 +372,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.
@@ -385,6 +397,8 @@ 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.
 
@@ -395,6 +409,7 @@ Moduł jądra Linuksa dla VirtualBoksa OSE - sterownik obsługi DRM.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -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
@@ -402,14 +417,18 @@ Moduł jądra Linuksa dla VirtualBoksa OSE - sterownik obsługi DRM.
 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}" \
@@ -421,15 +440,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
 
@@ -460,11 +481,11 @@ mv $RPM_BUILD_ROOT{%{_libdir}/%{pname},%{_pixmapsdir}}/VBox.png
 mv $RPM_BUILD_ROOT{%{_libdir}/%{pname},%{_desktopdir}}/virtualbox.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}
+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}
 %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
@@ -520,12 +541,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
 
@@ -720,6 +741,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
@@ -742,6 +764,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