X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=VirtualBox-bin.spec;h=103cd6493e5cdedfd4a41a0387921bbdc938c54d;hb=d7ca23015c9f4f11678cbedeee5f875daba353f9;hp=abfd7e28b09945cd1ac96bb0ffdc973049865154;hpb=d153d895647331107afa5b12a4575ac91a530aef;p=packages%2FVirtualBox-bin.git

diff --git a/VirtualBox-bin.spec b/VirtualBox-bin.spec
index abfd7e2..103cd64 100644
--- a/VirtualBox-bin.spec
+++ b/VirtualBox-bin.spec
@@ -2,8 +2,15 @@
 %bcond_without  dist_kernel     # without distribution kernel
 %bcond_without  kernel          # don't build kernel module
 %bcond_without  userspace       # don't build userspace package
+%bcond_with	force_userspace # force userspace build (useful if alt_kernel is set)
 %bcond_with     verbose 	# verbose kernel mod build
 
+%if "%{_alt_kernel}" != "%{nil}"
+%undefine	with_userspace
+%endif
+%if %{with force_userspace}
+%define		with_userspace 1
+%endif
 # disable debug - no symbols here
 %define		_enable_debug_packages	0
 %define		rel	1
@@ -12,13 +19,14 @@
 %else
 %define                arch    x86
 %endif
-%define		prev	61806
 
 %define		pname	VirtualBox
+%define		prev	63112
+
 Summary:	VirtualBox - x86 hardware virtualizer
 Summary(pl.UTF-8):	VirtualBox - wirtualizator sprzętu x86
 Name:		%{pname}-bin
-Version:	3.2.0
+Version:	3.2.6
 Release:	%{rel}
 License:	Free for non-commercial use, non-distributable
 Group:		Applications/Emulators
@@ -26,7 +34,7 @@ Group:		Applications/Emulators
 Source0:	%{pname}-%{version}-%{prev}-Linux_%{arch}.run
 NoSource:	0
 Source1:	http://download.virtualbox.org/virtualbox/%{version}/UserManual.pdf
-# Source1-md5:	09b98518de7eee5935aa4cc902195cbe
+# Source1-md5:	83793d20357353ef2588f2a93976d168
 Source3:	%{pname}-vboxdrv.init
 Source4:	%{pname}-vboxadd.init
 Source5:	%{pname}-vboxnetadp.init
@@ -36,6 +44,9 @@ Source8:	%{pname}.desktop
 Source9:	%{pname}.sh
 URL:		http://www.virtualbox.org/
 %{?with_userspace:BuildRequires:	ffmpeg-libs}
+%if %{with kernel}
+%{?with_dist_kernel:BuildRequires:	kernel%{_alt_kernel}-module-build}
+%endif
 BuildRequires:	rpmbuild(macros) >= 1.379
 Requires(post,preun):	/sbin/chkconfig
 Requires(postun):	/usr/sbin/groupdel
@@ -50,8 +61,8 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define	_noautoreq	libavcodec.so.51 libavformat.so.51
 
 %description
-Sun VirtualBox is a general-purpose full virtualizer for x86 hardware.
-Targeted at server, desktop and embedded use.
+Oracle VirtualBox is a general-purpose full virtualizer for x86
+hardware. Targeted at server, desktop and embedded use.
 
 Some of the features of VirtualBox are:
 
@@ -68,7 +79,7 @@ local machines. Virtual machine definitions can therefore easily be
 ported to other computers.
 
 %description -l pl.UTF-8
-Sun VirtualBox jest emulatorem sprzętu x86. Kierowany do zastosowań
+Oracle VirtualBox jest emulatorem sprzętu x86. Kierowany do zastosowań
 serwerowych, desktopowych oraz wbudowanych.
 
 Przykładowe cechy VirtualBoksa:
@@ -483,6 +494,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(nl) %{_libdir}/VirtualBox/nls/*_nl.qm
 %lang(pl) %{_libdir}/VirtualBox/nls/*_pl.qm
 %lang(pt) %{_libdir}/VirtualBox/nls/*_pt.qm
 %lang(pt_BR) %{_libdir}/VirtualBox/nls/*_pt_BR.qm