- blah, correct paths for Qt4 stuff

[packages/VirtualBox.git] / VirtualBox.spec

diff --git a/VirtualBox.spec b/VirtualBox.spec
index d5a6c8aa247f66ad00cf476eca55b0f7a778e384..4306bca8d442ce3c6a1a5e9a06a764b29a9627f9 100644 (file)
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -12,7 +12,7 @@
 %bcond_without userspace       # don't build userspace package
 %bcond_with    verbose
 
-%define                rel             12
+%define                rel             0.1
 
 %if %{without kernel}
 %undefine      with_dist_kernel
@@ -24,7 +24,8 @@
 
 %if "%{pld_release}" != "ti"
 %define                __ucc   gcc-3.4
-%define                __ucxx  g++-3.4
+%else
+%define                __ucc   %{__cc}
 %endif
 
 %define                pname   VirtualBox
@@ -32,16 +33,16 @@
 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:       2.0.0
 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
-Source2:       http://www.virtualbox.org/download/%{version}/VBoxGuestAdditions_%{version}.iso
-# Source2-md5: 3cac7e911e545038102ff641cba66365
+Source0:       http://download.virtualbox.org/virtualbox/%{version}/%{pname}-%{version}-OSE.tar.bz2
+# Source0-md5: 1f53ebed0f55df129f6cf72dba646c3a
+Source1:       http://download.virtualbox.org/virtualbox/%{version}/UserManual.pdf
+# Source1-md5: cf65a8164a18f7200520c1ec3399a918
+Source2:       http://download.virtualbox.org/virtualbox/%{version}/VBoxGuestAdditions_%{version}.iso
+# Source2-md5: ae0512b8db853fdea9fc262fc04bd242
 Source3:       %{pname}-vboxdrv.init
 Source4:       %{pname}-vboxadd.init
 Source5:       %{pname}.desktop
@@ -51,6 +52,7 @@ Patch1:               %{pname}-qt-paths.patch
 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
@@ -61,8 +63,6 @@ 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
@@ -159,7 +159,7 @@ 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
+Requires:      udev-core
 
 %description udev
 udev rules for VirtualBox OSE kernel modules.
@@ -261,6 +261,7 @@ Sterownik grafiki dla systemu gościa w VirtualBoksie.
 %endif
 
 %patch4 -p1
+%patch5 -p0
 
 cat <<'EOF' > udev.conf
 KERNEL=="vboxdrv", NAME="%k", GROUP="vbox", MODE="0660"
@@ -283,17 +284,13 @@ sed -i -e '/#.*define.*RTMEMALLOC_EXEC_HEAP/d' vboxadd/r0drv/linux/alloc-r0drv-l
 %build
 %if %{with userspace}
 ./configure \
-%if "%{pld_release}" == "ti"
        --with-gcc="%{__cc}" \
        --with-g++="%{__cxx}" \
-%else
-       --with-gcc="%{__ucc}" \
-       --with-g++="%{__ucxx}" \
-%endif
        --disable-qt4 \
        --disable-kmods
 
-. ./env.sh && kmk -j1
+. ./env.sh && \
+kmk -j1 VBOX_RECOMPILER_OP_GCC_PLD_COMPAT="%{__ucc}"
 %endif
 
 %if %{with kernel}