%bcond_without userspace # don't build userspace package
%bcond_with verbose
-%define rel 12
+%define rel 1
%if %{without kernel}
%undefine with_dist_kernel
%undefine with_userspace
%endif
+%if "%{pld_release}" != "ti"
%define __ucc gcc-3.4
-%define __ucxx g++-3.4
+%else
+%define __ucc %{__cc}
+%endif
%define pname VirtualBox
Summary: VirtualBox OSE - x86 hardware virtualizer
Summary(pl.UTF-8): VirtualBox OSE - wirtualizator sprzętu x86
Name: %{pname}%{_alt_kernel}
-Version: 1.6.2
+Version: 1.6.6
Release: %{rel}
License: GPL v2
Group: Applications/Emulators
-Source0: http://www.virtualbox.org/download/%{version}/%{pname}-%{version}-OSE.tar.bz2
-# Source0-md5: 0372a3a31326078f7849a0467d547a70
-Source1: http://www.virtualbox.org/download/%{version}/UserManual.pdf
-# Source1-md5: 32505857b575f0fb6f71ba1738c1e102
+Source0: http://download.virtualbox.org/virtualbox/%{version}/%{pname}-%{version}-OSE.tar.bz2
+# Source0-md5: 19f8cb080ec2cb11aab8b381d9b89323
+Source1: http://download.virtualbox.org/virtualbox/%{version}/UserManual.pdf
+# Source1-md5: 5b261cc5a752c4c28c40a93417c0434b
Source2: http://www.virtualbox.org/download/%{version}/VBoxGuestAdditions_%{version}.iso
-# Source2-md5: 3cac7e911e545038102ff641cba66365
+# Source2-md5: 2fff3ec12f5c3dd86bf41ee7c71e3bab
Source3: %{pname}-vboxdrv.init
Source4: %{pname}-vboxadd.init
Source5: %{pname}.desktop
Patch2: %{pname}-shared-libstdc++.patch
Patch3: %{pname}-disable-xclient-build.patch
Patch4: %{pname}-configure-spaces.patch
+Patch5: %{pname}-gcc.patch
URL: http://www.virtualbox.org/
%if %{with userspace}
BuildRequires: SDL-devel >= 1.2.7
BuildRequires: bcc
BuildRequires: bin86
BuildRequires: gcc >= 5:3.2.3
+%if "%{pld_release}" != "ti"
BuildRequires: compat-gcc-34
-BuildRequires: compat-gcc-34-c++
-BuildRequires: compat-gcc-34-libstdc++-devel
+%endif
BuildRequires: iasl
%endif
%if %{with dist_kernel}
Summary(pl.UTF-8): Reguły udev dla modułów jądra Linuksa dla VirtualBoksa
Release: %{rel}
Group: Base/Kernel
-Requires: udev
+Requires: udev-core
%description udev
udev rules for VirtualBox OSE kernel modules.
%endif
%patch4 -p1
+%patch5 -p0
cat <<'EOF' > udev.conf
KERNEL=="vboxdrv", NAME="%k", GROUP="vbox", MODE="0660"
%build
%if %{with userspace}
./configure \
- --with-gcc="%{__ucc}" \
- --with-g++="%{__ucxx}" \
+ --with-gcc="%{__cc}" \
+ --with-g++="%{__cxx}" \
--disable-qt4 \
--disable-kmods
-. ./env.sh && kmk -j1
+. ./env.sh && \
+kmk -j1 VBOX_RECOMPILER_OP_GCC_PLD_COMPAT="%{__ucc}"
%endif
%if %{with kernel}