- files updated

[packages/VirtualBox.git] / VirtualBox.spec

diff --git a/VirtualBox.spec b/VirtualBox.spec
index 4fc22bfe95b4362421dc4a6c3640611cb76839a3..06838182a654abcce06beb18e5a31deb2dc8ac97 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             1
+%define                rel             0.2
 
 %if %{without kernel}
 %undefine      with_dist_kernel
@@ -22,27 +22,21 @@
 %undefine      with_userspace
 %endif
 
-%if "%{pld_release}" != "ti"
-%define                __ucc   gcc-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.6
+Version:       2.0.0
 Release:       %{rel}
 License:       GPL v2
 Group:         Applications/Emulators
 Source0:       http://download.virtualbox.org/virtualbox/%{version}/%{pname}-%{version}-OSE.tar.bz2
-# Source0-md5: 19f8cb080ec2cb11aab8b381d9b89323
+# Source0-md5: 1f53ebed0f55df129f6cf72dba646c3a
 Source1:       http://download.virtualbox.org/virtualbox/%{version}/UserManual.pdf
-# Source1-md5: 5b261cc5a752c4c28c40a93417c0434b
-Source2:       http://www.virtualbox.org/download/%{version}/VBoxGuestAdditions_%{version}.iso
-# Source2-md5: 2fff3ec12f5c3dd86bf41ee7c71e3bab
+# 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
@@ -52,7 +46,6 @@ 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
@@ -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}
@@ -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}
@@ -261,7 +254,6 @@ 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"
@@ -285,12 +277,15 @@ sed -i -e '/#.*define.*RTMEMALLOC_EXEC_HEAP/d' vboxadd/r0drv/linux/alloc-r0drv-l
 %if %{with userspace}
 ./configure \
        --with-gcc="%{__cc}" \
+%if "%{pld_release}" != "ti"
+       --with-gcc-compat="gcc-3.4" \
+%endif
        --with-g++="%{__cxx}" \
-       --disable-qt4 \
+       --disable-qt3 \
        --disable-kmods
 
 . ./env.sh && \
-kmk -j1 VBOX_RECOMPILER_OP_GCC_PLD_COMPAT="%{__ucc}"
+kmk -j1 %{?with_verbose:KBUILD_VERBOSE=3}
 %endif
 
 %if %{with kernel}
@@ -311,7 +306,7 @@ install -d \
        $RPM_BUILD_ROOT%{_libdir}/VirtualBox
 
 install %{SOURCE6} $RPM_BUILD_ROOT%{_libdir}/VirtualBox/VirtualBox-wrapper.sh
-for f in {VBox{BFE,Manage,SDL,SVC,XPCOMIPCD},VirtualBox,vditool}; do
+for f in {VBox{BFE,Headless,Manage,SDL,SVC,Tunctl,XPCOMIPCD},VirtualBox,vditool}; do
        install out/linux.%{outdir}/release/bin/$f $RPM_BUILD_ROOT%{_libdir}/VirtualBox/$f
        ln -s %{_libdir}/VirtualBox/VirtualBox-wrapper.sh $RPM_BUILD_ROOT%{_bindir}/$f
 done
@@ -323,7 +318,7 @@ install out/linux.%{outdir}/release/bin/VBox*.rel \
 
 install out/linux.%{outdir}/release/bin/VBox*.so \
        $RPM_BUILD_ROOT%{_libdir}/VirtualBox
-install out/linux.%{outdir}/release/bin/{VBox{DD,DD2}{GC.gc,R0.r0},VMM{GC.gc,R0.r0},*.xpt} \
+install out/linux.%{outdir}/release/bin/{VBox{DD,DD2}{GC.gc,R0.r0},VMM{GC.gc,R0.r0}} \
        $RPM_BUILD_ROOT%{_libdir}/VirtualBox
 
 install -d $RPM_BUILD_ROOT%{_libdir}/VirtualBox/additions
@@ -433,8 +428,10 @@ fi
 %attr(755,root,root) %{_libdir}/VirtualBox/vditool
 %attr(755,root,root) %{_libdir}/VirtualBox/VBoxSVC
 %attr(755,root,root) %{_libdir}/VirtualBox/VBoxBFE
+%attr(755,root,root) %{_libdir}/VirtualBox/VBoxHeadless
 %attr(755,root,root) %{_libdir}/VirtualBox/VBoxManage
 %attr(755,root,root) %{_libdir}/VirtualBox/VBoxSDL
+%attr(755,root,root) %{_libdir}/VirtualBox/VBoxTunctl
 %attr(755,root,root) %{_libdir}/VirtualBox/VBoxXPCOMIPCD
 %attr(755,root,root) %{_libdir}/VirtualBox/VBox*.so
 %ifarch %{x8664}
@@ -444,7 +441,6 @@ fi
 %attr(755,root,root) %{_libdir}/VirtualBox/VirtualBox-wrapper.sh
 %{_libdir}/VirtualBox/*.gc
 %{_libdir}/VirtualBox/*.r0
-%{_libdir}/VirtualBox/*.xpt
 %{_libdir}/VirtualBox/additions/*
 %{_libdir}/VirtualBox/components/*
 %lang(ar) %{_libdir}/VirtualBox/nls/*_ar.qm