- blah, too fast

[packages/VirtualBox.git] / VirtualBox.spec

diff --git a/VirtualBox.spec b/VirtualBox.spec
index d5a6c8aa247f66ad00cf476eca55b0f7a778e384..bfac7dc47222eb31af8529f6b57fba55e4518c58 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.2
 
 %if %{without kernel}
 %undefine      with_dist_kernel
@@ -22,26 +22,21 @@
 %undefine      with_userspace
 %endif
 
-%if "%{pld_release}" != "ti"
-%define                __ucc   gcc-3.4
-%define                __ucxx  g++-3.4
-%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:       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
@@ -61,8 +56,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
@@ -79,8 +72,8 @@ BuildRequires:        libxslt-devel >= 1.1.17
 BuildRequires: libxslt-progs >= 1.1.17
 BuildRequires: pkgconfig
 BuildRequires: pulseaudio-devel >= 0.9.0
-BuildRequires: qt-devel >= 6:3.3.6
-BuildRequires: qt-linguist
+BuildRequires: qt4-build >= 4.2.0
+BuildRequires: qt4-linguist
 %endif
 BuildRequires: rpmbuild(macros) >= 1.379
 %if %{with userspace}
@@ -159,7 +152,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.
@@ -252,8 +245,8 @@ Sterownik grafiki dla systemu gościa w VirtualBoksie.
 
 %prep
 %setup -q -n %{pname}-%{version}
-%patch0 -p0
-%patch1 -p0
+%patch0 -p1
+%patch1 -p1
 %patch2 -p1
 
 %ifarch %{x8664}
@@ -283,17 +276,16 @@ 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}" \
+%if "%{pld_release}" != "ti"
+       --with-gcc-compat="gcc-3.4" \
 %endif
-       --disable-qt4 \
+       --with-g++="%{__cxx}" \
+       --disable-qt3 \
        --disable-kmods
 
-. ./env.sh && kmk -j1
+. ./env.sh && \
+kmk -j1
 %endif
 
 %if %{with kernel}