%bcond_without kernel # don't build kernel module
%bcond_without userspace # don't build userspace package
-%define rel 9
+%define rel 0.1
%if %{without kernel}
%undefine with_dist_kernel
%define pname VirtualBox
-Summary: VirtualBox - x86 hardware virtualizer
-Summary(pl.UTF-8): VirtualBox - wirtualizator sprzętu x86
+Summary: VirtualBox OSE - x86 hardware virtualizer
+Summary(pl.UTF-8): VirtualBox OSE - wirtualizator sprzętu x86
Name: %{pname}%{_alt_kernel}
-Version: 1.5.6
+Version: 1.6.0
Release: %{rel}
License: GPL v2
Group: Applications/Emulators
-Source0: http://www.virtualbox.org/download/%{version}/%{pname}-%{version}-1_OSE.tar.bz2
-# Source0-md5: 305c65f9e91b6137cb773d578de09922
+# Source can't be downloaded directly anymore, you may get it manually from
+# http://www.virtualbox.org/wiki/Downloads
+Source0: %{pname}-%{version}-OSE.tar.bz2
+# Source0-md5: 44692aa0e7a8cb6bb36f367d67d78d6a
Source1: http://www.virtualbox.org/download/%{version}/UserManual.pdf
-# Source1-md5: 9ba7f17584fb3e9c98e026a1501cf7c0
+# Source1-md5: e21694fd087b42173bca3fc9af068f22
Source2: http://www.virtualbox.org/download/%{version}/VBoxGuestAdditions_%{version}.iso
-# Source2-md5: 9d74dea92bd225ad59faee9fd427a55e
+# Source2-md5: e90b718aa806845194fd411e3dbf78ff
Source3: %{pname}.init
Source4: %{pname}.desktop
Source5: %{pname}.sh
Patch1: %{pname}-qt-paths.patch
Patch2: %{pname}-shared-libstdc++.patch
Patch3: %{pname}-disable-xclient-build.patch
+Patch4: %{pname}-configure-spaces.patch
URL: http://www.virtualbox.org/
-BuildRequires: SDL-devel
-BuildRequires: alsa-lib-devel
+%if %{with userspace}
+BuildRequires: SDL-devel >= 1.2.7
+BuildRequires: alsa-lib-devel >= 1.0.6
BuildRequires: bash
BuildRequires: bcc
BuildRequires: bin86
BuildRequires: gcc >= 5:3.2.3
BuildRequires: iasl
-%{?with_dist_kernel:BuildRequires: kernel%{_alt_kernel}-module-build >= 3:2.6.7}
+%endif
+%{?with_dist_kernel:BuildRequires: kernel%{_alt_kernel}-module-build >= 3:2.6.20}
+%if %{with userspace}
+BuildRequires: Qt3Support-devel
BuildRequires: libIDL-devel
+BuildRequires: libpng >= 1.2.5
+BuildRequires: libstdc++-static >= 5:3.2.3
BuildRequires: libuuid-devel
-BuildRequires: libxslt-progs
+BuildRequires: libxml2-devel >= 2.6.26
+BuildRequires: libxslt-devel >= 1.1.17
+BuildRequires: libxslt-progs >= 1.1.17
BuildRequires: pkgconfig
-BuildRequires: pulseaudio-devel
+BuildRequires: pulseaudio-devel >= 0.9.0
BuildRequires: qt-devel >= 6:3.3.6
BuildRequires: qt-linguist
-BuildRequires: rpmbuild(macros) >= 1.329
+BuildRequires: qt4-build >= 4.2.0
+%endif
+BuildRequires: rpmbuild(macros) >= 1.379
+%if %{with userspace}
BuildRequires: which
BuildRequires: xalan-c-devel >= 1.10.0
BuildRequires: xerces-c-devel >= 2.6.0
BuildRequires: zlib-devel >= 1.2.1
%ifarch %{x8664}
BuildRequires: gcc-multilib
+BuildRequires: glibc-devel(i686)
BuildRequires: libstdc++-multilib-devel
-# TODO: How to add glibc-devel.i686 here ?
+%endif
%endif
Requires(post,preun): /sbin/chkconfig
Requires(postun): /usr/sbin/groupdel
%endif
%description
-InnoTek VirtualBox is a general-purpose full virtualizer for x86
+InnoTek VirtualBox OSE is a general-purpose full virtualizer for x86
hardware. Targeted at server, desktop and embedded use, it is now the
only professional-quality virtualization solution that is also Open
Source Software.
-Some of the features of VirtualBox are:
+Some of the features of VirtualBox OSE are:
-Modularity: VirtualBox has an extremely modular design with
+Modularity: VirtualBox OSE has an extremely modular design with
well-defined internal programming interfaces and a client/server
design. This makes it easy to control it from several interfaces at
once: for example, you can start a virtual machine in a typical
virtual machine GUI and then control that machine from the command
-line. VirtualBox also comes with a full Software Development Kit: even
-though it is Open Source Software, you don't have to hack the source
-to write a new interface for VirtualBox.
+line. VirtualBox OSE also comes with a full Software Development Kit:
+even though it is Open Source Software, you don't have to hack the
+source to write a new interface for VirtualBox OSE.
Virtual machine descriptions in XML: the configuration settings of
virtual machines are stored entirely in XML and are independent of the
ported to other computers.
%description -l pl.UTF-8
-InnoTek VirtualBox jest emulatorem sprzętu x86. Kierowany do
+InnoTek VirtualBox OSE jest emulatorem sprzętu x86. Kierowany do
zastosowań serwerowych, desktopowych oraz wbudowanych jest obecnie
jedynym wysokiej jakości rozwiązaniem wirtualizacyjnym dostępnym
również jako Otwarte Oprogramowanie.
Przykładowe cechy VirtualBoksa:
-Modularność: VirtualBox jest wysoce zmodularyzowanym produktem z
+Modularność: VirtualBox OSE jest wysoce zmodularyzowanym produktem z
dobrze zaprojektowanym wewnętrznym interfejsem programowym typu
klient/serwer. Dzięki temu można łatwo kontrolować go za pomocą
różnych interfejsów. Można na przykład uruchomić maszynę wirtualną z
poziomu interfejsu graficznego, a później kontrolować ją z linii
-poleceń. VirtualBox dostarcza również pełny pakiet deweloperski, co
-pozwala stworzyć dowolny inny interfejs zarządzania maszyną wirtualną.
+poleceń. VirtualBox OSE dostarcza również pełny pakiet deweloperski,
+co pozwala stworzyć dowolny inny interfejs zarządzania maszyną
+wirtualną.
Opisy maszyn wirtualnych w XML-u: konfiguracje poszczególnych maszyn
wirtualnych są w całości przechowywane w XML-u i są niezależne od
konfigurację maszyny wirtualnej na inny komputer.
%package udev
-Summary: udev rules for VirtualBox kernel modules
+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}@%{_kernel_ver_str}
+Release: %{rel}
Group: Base/Kernel
Requires: udev
%description udev
-udev rules for VirtualBox kernel modules
+udev rules for VirtualBox OSE kernel modules.
%description udev -l pl.UTF-8
-Reguły udev dla modułów jądra Linuksa dla VirtualBoksa
+Reguły udev dla modułów jądra Linuksa dla VirtualBoksa.
%package -n kernel%{_alt_kernel}-misc-vboxadd
-Summary: Linux kernel module for VirtualBox
+Summary: Linux kernel module for VirtualBox OSE
Summary(pl.UTF-8): Moduł jądra Linuksa dla VirtualBoksa
Release: %{rel}@%{_kernel_ver_str}
Group: Base/Kernel
Provides: kernel(vboxadd) = %{version}-%{rel}
%description -n kernel%{_alt_kernel}-misc-vboxadd
-Linux kernel module vboxadd for VirtualBox.
+Linux kernel module vboxadd for VirtualBox OSE.
%description -n kernel%{_alt_kernel}-misc-vboxadd -l pl.UTF-8
Moduł jądra Linuksa vboxadd dla VirtualBoksa.
%package -n kernel%{_alt_kernel}-misc-vboxdrv
-Summary: Linux kernel module for VirtualBox
+Summary: Linux kernel module for VirtualBox OSE
Summary(pl.UTF-8): Moduł jądra Linuksa dla VirtualBoksa
Release: %{rel}@%{_kernel_ver_str}
Group: Base/Kernel
Provides: kernel(vboxdrv) = %{version}-%{rel}
%description -n kernel%{_alt_kernel}-misc-vboxdrv
-Linux kernel module vboxdrv for VirtualBox.
+Linux kernel module vboxdrv for VirtualBox OSE.
%description -n kernel%{_alt_kernel}-misc-vboxdrv -l pl.UTF-8
Moduł jądra Linuksa vboxdrv dla VirtualBoksa.
%package -n kernel%{_alt_kernel}-misc-vboxvfs
-Summary: Linux kernel module for VirtualBox
+Summary: Linux kernel module for VirtualBox OSE
Summary(pl.UTF-8): Moduł jądra Linuksa dla VirtualBoksa
Release: %{rel}@%{_kernel_ver_str}
Group: Base/Kernel
Provides: kernel(vboxvfs) = %{version}-%{rel}
%description -n kernel%{_alt_kernel}-misc-vboxvfs
-Linux kernel module vboxvfs for VirtualBox.
+Linux kernel module vboxvfs for VirtualBox OSE.
%description -n kernel%{_alt_kernel}-misc-vboxvfs -l pl.UTF-8
Moduł jądra Linuksa vboxvfs dla VirtualBoksa.
%package -n xorg-driver-input-vboxmouse
-Summary: X.org mouse driver for VirtualBox guest OS
+Summary: X.org mouse driver for VirtualBox OSE guest OS
Summary(pl.UTF-8): Sterownik myszy dla systemu gościa w VirtualBoksie
Release: %{rel}
Group: X11/Applications
Requires: xorg-xserver-server >= 1.0.99.901
%description -n xorg-driver-input-vboxmouse
-X.org mouse driver for VirtualBox guest OS.
+X.org mouse driver for VirtualBox OSE guest OS.
%description -n xorg-driver-input-vboxmouse -l pl.UTF-8
Sterownik myszy dla systemu gościa w VirtualBoksie.
%package -n xorg-driver-video-vboxvideo
-Summary: X.org video driver for VirtualBox guest OS
+Summary: X.org video driver for VirtualBox OSE guest OS
Summary(pl.UTF-8): Sterownik grafiki dla systemu gościa w VirtualBoksie
Release: %{rel}
Group: X11/Applications
Requires: xorg-xserver-server >= 1.0.99.901
%description -n xorg-driver-video-vboxvideo
-X.org video driver for VirtualBox guest OS.
+X.org video driver for VirtualBox OSE guest OS.
%description -n xorg-driver-video-vboxvideo -l pl.UTF-8
Sterownik grafiki dla systemu gościa w VirtualBoksie.
%patch3 -p1
%endif
+%patch4 -p1
+
cat <<'EOF' > udev.conf
KERNEL=="vboxdrv", NAME="%k", GROUP="vbox", MODE="0660"
EOF
install %{SOURCE1} .
-%build
-KDIR="%{_builddir}/%{buildsubdir}/kernel"
-mkdir -p $KDIR
-cp -Ra %{_kernelsrcdir}/include $KDIR
-%ifarch %{x8664} %{ix86}
-if [ -d $KDIR/include/asm-x86 ]; then
- ln -sf $KDIR/include/asm-x86 $KDIR/include/asm
-else
-%ifarch %{x8664}
- ln -sf $KDIR/include/asm-x86_64 $KDIR/include/asm
-%else
- ln -sf $KDIR/include/asm-i386 $KDIR/include/asm
-%endif
-fi
-%endif
+rm -rf PLD-MODULE-BUILD && mkdir PLD-MODULE-BUILD && cd PLD-MODULE-BUILD
+../src/VBox/Additions/linux/export_modules modules.tar.gz
+ tar -zxf modules.tar.gz && rm -f modules.tar.gz
+../src/VBox/HostDrivers/Support/linux/export_modules modules.tar.gz && \
+ tar -zxf modules.tar.gz && rm -f modules.tar.gz
-%if %{with dist_kernel}
-ln -sf $KDIR/include/linux/autoconf-dist.h $KDIR/include/linux/autoconf.h
-%else
-ln -sf $KDIR/include/linux/autoconf-nondist.h $KDIR/include/linux/autoconf.h
+%ifarch %{x8664}
+# HACK, is this really safe on x86_64?
+sed -i -e '/#.*define.*RTMEMALLOC_EXEC_HEAP/d' vboxadd/r0drv/linux/alloc-r0drv-linux.c vboxvfs/r0drv/linux/alloc-r0drv-linux.c
%endif
+%build
+%if %{with userspace}
./configure \
--with-gcc="%{__cc}" \
--with-g++="%{__cxx}" \
- --with-linux="$KDIR"
+ --disable-kmods
-%if %{with userspace}
. ./env.sh && kmk -j1
%endif
%if %{with kernel}
-rm -rf PLD-MODULE-BUILD && mkdir PLD-MODULE-BUILD && cd PLD-MODULE-BUILD
-
-../src/VBox/HostDrivers/Support/linux/export_modules modules.tar.gz && \
- tar -zxf modules.tar.gz && rm -f modules.tar.gz
-../src/VBox/Additions/linux/export_modules modules.tar.gz
- tar -zxf modules.tar.gz && rm -f modules.tar.gz
-
-%ifarch %{x8664}
-# HACK, is this really safe on x86_64?
-sed -i -e 's:#.*define.*RTMEMALLOC_EXEC_HEAP::g' vboxadd/r0drv/linux/alloc-r0drv-linux.c vboxvfs/r0drv/linux/alloc-r0drv-linux.c
-%endif
-
+cd PLD-MODULE-BUILD
%build_kernel_modules -m vboxadd -C vboxadd
%build_kernel_modules -m vboxdrv -C vboxdrv
cp -a vboxadd/Module.symvers vboxvfs
-%build_kernel_modules -m vboxvfs -C vboxvfs
+%build_kernel_modules -m vboxvfs -C vboxvfs -c
cd ..
%endif
install -d \
$RPM_BUILD_ROOT{%{_bindir},%{_pixmapsdir},%{_desktopdir}} \
$RPM_BUILD_ROOT%{_libdir}/VirtualBox \
- $RPM_BUILD_ROOT/etc/rc.d/init.d \
- $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers \
- $RPM_BUILD_ROOT%{_libdir}/xorg/modules/input
+ $RPM_BUILD_ROOT/etc/rc.d/init.d
install %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/virtualbox
install out/linux.%{outdir}/release/bin/additions/mountvboxsf \
$RPM_BUILD_ROOT%{_bindir}
+%ifnarch %{x8664}
+install -d $RPM_BUILD_ROOT%{_libdir}/xorg/modules/{drivers,input}
install out/linux.%{outdir}/release/bin/additions/vboxmouse_drv_14.so \
$RPM_BUILD_ROOT%{_libdir}/xorg/modules/input/vboxmouse_drv.so
-
install out/linux.%{outdir}/release/bin/additions/vboxvideo_drv_14.so \
$RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so
+%endif
install out/linux.%{outdir}/release/bin/VBox.png $RPM_BUILD_ROOT%{_pixmapsdir}/VBox.png
install %{SOURCE4} $RPM_BUILD_ROOT%{_desktopdir}/%{pname}.desktop
%endif
%if %{with kernel}
-cd PLD-MODULE-BUILD
-for MODULE in *; do
- [ ! -d $MODULE ] && continue;
-
- cd $MODULE
- %install_kernel_modules -m $MODULE -d misc
- cd ..
-done
-cd ..
+%install_kernel_modules -m PLD-MODULE-BUILD/vboxadd/vboxadd -d misc
+%install_kernel_modules -m PLD-MODULE-BUILD/vboxdrv/vboxdrv -d misc
+%install_kernel_modules -m PLD-MODULE-BUILD/vboxvfs/vboxvfs -d misc
%endif
%clean
%post
/sbin/chkconfig --add virtualbox
-%service virtualbox restart "VirtualBox"
+%service virtualbox restart "VirtualBox OSE"
%preun
if [ "$1" = "0" ]; then
projects / packages / VirtualBox.git / blobdiff