%bcond_without dist_kernel # without distribution kernel
%bcond_without kernel # don't build kernel module
%bcond_without userspace # don't build userspace package
-
-%define rel 3
+%bcond_with verbose
%if %{without kernel}
%undefine with_dist_kernel
%endif
-
%if "%{_alt_kernel}" != "%{nil}"
%undefine with_userspace
%endif
+%if %{without userspace}
+# nothing to be placed to debuginfo package
+%define _enable_debug_packages 0
+%endif
+%define rel 0.1
%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.1.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: %{pname}-%{version}-OSE.tar.bz2
+# Source0-md5: bcd403d97e2caf8a634584df34766a4d
+#Source1: http://download.virtualbox.org/virtualbox/%{version}/UserManual.pdf
+Source1: UserManual.pdf
+# Source1-md5: 61f8fa9321b65f8b2e50cfc076d671cb
+#Source2: http://download.virtualbox.org/virtualbox/%{version}/VBoxGuestAdditions_%{version}.iso
+Source2: VBoxGuestAdditions_%{version}.iso
+# Source2-md5: f6514091a6cca90cdc22591a789ed9b0
Source3: %{pname}-vboxdrv.init
Source4: %{pname}-vboxadd.init
-Source5: %{pname}.desktop
-Source6: %{pname}.sh
+Source5: %{pname}-vboxvfs.init
+Source6: %{pname}.desktop
+Source7: %{pname}.sh
Patch0: %{pname}-configure.patch
Patch1: %{pname}-qt-paths.patch
Patch2: %{pname}-shared-libstdc++.patch
Patch3: %{pname}-disable-xclient-build.patch
Patch4: %{pname}-configure-spaces.patch
+Patch5: %{pname}-build_fix.patch
URL: http://www.virtualbox.org/
+BuildRequires: rpmbuild(macros) >= 1.379
%if %{with userspace}
+%ifarch %{x8664}
+BuildRequires: gcc-multilib
+BuildRequires: glibc-devel(i686)
+BuildRequires: libstdc++-multilib-devel
+%endif
+%if "%{pld_release}" == "th"
+BuildRequires: compat-gcc-34
+%endif
+%if "%{pld_release}" == "ti"
+BuildRequires: gcc3
+%endif
+%if "%{pld_release}" == "ac"
+BuildRequires: XFree86-devel
+%else
+BuildRequires: xorg-lib-libXcursor-devel
+BuildRequires: xorg-lib-libXmu-devel
+%endif
+BuildRequires: OpenGL-devel
+BuildRequires: QtGui-devel
BuildRequires: SDL-devel >= 1.2.7
+BuildRequires: acpica
BuildRequires: alsa-lib-devel >= 1.0.6
BuildRequires: bash
BuildRequires: bcc
BuildRequires: bin86
BuildRequires: gcc >= 5:3.2.3
-BuildRequires: iasl
-%endif
-%if %{with dist_kernel}
-BuildRequires: kernel%{_alt_kernel}-module-build >= 3:2.6.20
-%endif
-%if %{with userspace}
-BuildRequires: Qt3Support-devel
BuildRequires: libIDL-devel
-BuildRequires: libpng >= 1.2.5
+BuildRequires: libpng-devel >= 1.2.5
BuildRequires: libstdc++-devel >= 5:3.2.3
BuildRequires: libuuid-devel
BuildRequires: libxml2-devel >= 2.6.26
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: python-devel
BuildRequires: qt4-build >= 4.2.0
-%endif
-BuildRequires: rpmbuild(macros) >= 1.379
-%if %{with userspace}
+BuildRequires: qt4-linguist
+BuildRequires: sed >= 4.0
BuildRequires: which
BuildRequires: xalan-c-devel >= 1.10.0
BuildRequires: xerces-c-devel >= 2.6.0
-BuildRequires: xorg-lib-libXcursor-devel
BuildRequires: zlib-devel >= 1.2.1
-%ifarch %{x8664}
-BuildRequires: gcc-multilib
-BuildRequires: glibc-devel(i686)
-BuildRequires: libstdc++-multilib-devel
%endif
+%if %{with dist_kernel}
+BuildRequires: kernel%{_alt_kernel}-module-build >= 3:2.6.20
%endif
Requires(post,preun): /sbin/chkconfig
Requires(postun): /usr/sbin/groupdel
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.
Reguły udev dla modułów jądra Linuksa dla VirtualBoksa.
%package -n kernel%{_alt_kernel}-misc-vboxadd
-Summary: Linux kernel module for VirtualBox OSE
+Summary: VirtualBox OSE Guest Additions for Linux Module
Summary(pl.UTF-8): Moduł jądra Linuksa dla VirtualBoksa
Release: %{rel}@%{_kernel_ver_str}
Group: Base/Kernel
Requires: dev >= 2.9.0-7
%if %{with dist_kernel}
%requires_releq_kernel
-#Requires(postun): %%releq_kernel
+Requires(postun): %releq_kernel
%endif
Provides: kernel(vboxadd) = %{version}-%{rel}
%description -n kernel%{_alt_kernel}-misc-vboxadd
-Linux kernel module vboxadd for VirtualBox OSE.
+VirtualBox OSE Guest Additions for Linux Module.
%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 OSE
+Summary: VirtualBox OSE Support Driver
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 OSE.
+VirtualBox OSE Support Driver.
%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 OSE
+Summary: Host file system access VFS for VirtualBox OSE
Summary(pl.UTF-8): Moduł jądra Linuksa dla VirtualBoksa
Release: %{rel}@%{_kernel_ver_str}
Group: Base/Kernel
Requires(post,postun): /sbin/depmod
Requires: dev >= 2.9.0-7
+Requires: kernel%{_alt_kernel}-misc-vboxadd
%if %{with dist_kernel}
%requires_releq_kernel
Requires(postun): %releq_kernel
Provides: kernel(vboxvfs) = %{version}-%{rel}
%description -n kernel%{_alt_kernel}-misc-vboxvfs
-Linux kernel module vboxvfs for VirtualBox OSE.
+Host file system access VFS for VirtualBox OSE.
%description -n kernel%{_alt_kernel}-misc-vboxvfs -l pl.UTF-8
Moduł jądra Linuksa vboxvfs dla VirtualBoksa.
%prep
%setup -q -n %{pname}-%{version}
-%patch0 -p0
-%patch1 -p0
+%patch0 -p1
+%patch1 -p1
%patch2 -p1
%ifarch %{x8664}
%endif
%patch4 -p1
+%patch5 -p0
cat <<'EOF' > udev.conf
KERNEL=="vboxdrv", NAME="%k", GROUP="vbox", MODE="0660"
EOF
install %{SOURCE1} .
+sed 's#@LIBDIR@#%{_libdir}#' < %{SOURCE7} > VirtualBox-wrapper.sh
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
-
-%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
+sed -i -e 's/-DVBOX_WITH_HARDENING//g' vboxdrv/Makefile
%build
%if %{with userspace}
./configure \
--with-gcc="%{__cc}" \
+%if "%{pld_release}" == "th"
+ --with-gcc-compat="gcc-3.4" \
+%endif
+%if "%{pld_release}" == "ti"
+ --with-gcc-compat="gcc3" \
+%endif
--with-g++="%{__cxx}" \
- --disable-kmods
+ --disable-hardening \
+ --disable-kmods \
+ --disable-qt3
-. ./env.sh && kmk -j1
+. ./env.sh && \
+kmk -j1 %{?with_verbose:KBUILD_VERBOSE=3}
%endif
%if %{with kernel}
$RPM_BUILD_ROOT{%{_bindir},%{_pixmapsdir},%{_desktopdir}} \
$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
+install VirtualBox-wrapper.sh $RPM_BUILD_ROOT%{_libdir}/VirtualBox
+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
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
%ifnarch %{x8664}
install -d $RPM_BUILD_ROOT%{_libdir}/xorg/modules/{drivers,input}
-install out/linux.%{outdir}/release/bin/additions/vboxmouse_drv_14.so \
+install out/linux.%{outdir}/release/bin/additions/vboxmouse_drv_15.so \
$RPM_BUILD_ROOT%{_libdir}/xorg/modules/input/vboxmouse_drv.so
-install out/linux.%{outdir}/release/bin/additions/vboxvideo_drv_14.so \
+install out/linux.%{outdir}/release/bin/additions/vboxvideo_drv_15.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 %{SOURCE5} $RPM_BUILD_ROOT%{_desktopdir}/%{pname}.desktop
+install %{SOURCE6} $RPM_BUILD_ROOT%{_desktopdir}/%{pname}.desktop
install -d $RPM_BUILD_ROOT/etc/udev/rules.d
install udev.conf $RPM_BUILD_ROOT/etc/udev/rules.d/virtualbox.rules
install -d $RPM_BUILD_ROOT/etc/rc.d/init.d
install %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/vboxdrv
install %{SOURCE4} $RPM_BUILD_ROOT/etc/rc.d/init.d/vboxadd
+install %{SOURCE5} $RPM_BUILD_ROOT/etc/rc.d/init.d/vboxvfs
%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
%post -n kernel%{_alt_kernel}-misc-vboxvfs
%depmod %{_kernel_ver}
+/sbin/chkconfig --add vboxvfs
+%service vboxvfs restart "VirtualBox OSE guest additions VFS driver"
%postun -n kernel%{_alt_kernel}-misc-vboxvfs
%depmod %{_kernel_ver}
+%preun -n kernel%{_alt_kernel}-misc-vboxvfs
+if [ "$1" = "0" ]; then
+ %service vboxvfs stop
+ /sbin/chkconfig --del vboxvfs
+fi
+
%if %{with userspace}
%files
%defattr(644,root,root,755)
%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}
%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