- added x32 to supported archs (kernel modules build for sure there)

[packages/VirtualBox.git] / VirtualBox.spec

diff --git a/VirtualBox.spec b/VirtualBox.spec
index c0337918c6f8d5c975312c209454d10be144f733..87b5f949e673ed1692d70567a191e301e46edc48 100644 (file)
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -13,7 +13,6 @@
 # Conditional build:
 %bcond_without doc             # don't build the documentation
 %bcond_without debuginfo               # disable debuginfo creation (to save space when compiling)
-%bcond_without dist_kernel     # without distribution kernel
 %bcond_without kernel          # don't build kernel module
 %bcond_without userspace       # don't build userspace package
 %bcond_with    webservice      # webservice (SOAP) support
@@ -21,12 +20,6 @@
 %bcond_without dkms            # build dkms package
 %bcond_without verbose
 
-%if %{without kernel}
-%undefine      with_dist_kernel
-%else
-%define                _duplicate_files_terminate_build        0
-%endif
-
 # The goal here is to have main, userspace, package built once with
 # simple release number, and only rebuild kernel packages with kernel
 # version as part of release number, without the need to bump release
@@ -36,15 +29,8 @@
 exit 1
 %endif
 
-%if "%{_alt_kernel}" != "%{nil}"
-%if 0%{?build_kernels:1}
-%{error:alt_kernel and build_kernels are mutually exclusive}
-exit 1
-%endif
-%undefine      with_userspace
-%global                _build_kernels          %{alt_kernel}
-%else
-%global                _build_kernels          %{?build_kernels:,%{?build_kernels}}
+%if %{with kernel}
+%define                _duplicate_files_terminate_build        0
 %endif
 
 %if %{without userspace}
@@ -61,7 +47,7 @@ exit 1
 %define                bkpkg   %(echo %{_build_kernels} | tr , '\\n' | while read n ; do echo %%undefine alt_kernel ; [ -z "$n" ] || echo %%define alt_kernel $n ; echo %%build_kernel_pkg ; done)
 %define                ikpkg   %(echo %{_build_kernels} | tr , '\\n' | while read n ; do echo %%undefine alt_kernel ; [ -z "$n" ] || echo %%define alt_kernel $n ; echo %%install_kernel_pkg ; done)
 
-%define                rel             1
+%define                rel             3
 %define                pname           VirtualBox
 Summary:       VirtualBox - x86 hardware virtualizer
 Summary(pl.UTF-8):     VirtualBox - wirtualizator sprzętu x86
@@ -99,10 +85,10 @@ Patch13:    %{pname}-all-translations.patch
 URL:           http://www.virtualbox.org/
 %if %{with userspace}
 %ifarch %{x8664}
-BuildRequires: gcc-multilib
+BuildRequires: gcc-multilib-32
 BuildRequires: glibc-devel(i686)
-BuildRequires: libstdc++-multilib-devel
-BuildRequires: libstdc++-multilib-static
+BuildRequires: libstdc++-multilib-32-devel
+BuildRequires: libstdc++-multilib-32-static
 %endif
 %if "%{pld_release}" == "ac"
 BuildRequires: XFree86-devel
@@ -156,7 +142,7 @@ BuildRequires:      python-devel
 BuildRequires: python-modules
 BuildRequires: qt4-build >= 4.2.0
 BuildRequires: qt4-linguist
-BuildRequires: rpmbuild(macros) >= 1.678
+BuildRequires: rpmbuild(macros) >= 1.701
 BuildRequires: sed >= 4.0
 %if %{with doc}
 BuildRequires: texlive-fonts-bitstream
@@ -172,7 +158,7 @@ BuildRequires:      xerces-c-devel >= 2.6.0
 BuildRequires: yasm
 BuildRequires: zlib-devel >= 1.2.1
 %endif
-%{?with_dist_kernel:%{expand:%kbrs}}
+%{?with_kernel:%{expand:%buildrequires_kernel kernel%%{_alt_kernel}-module-build >= 3:2.6.20.2}}
 Requires(post,preun):  /sbin/chkconfig
 Requires(postun):      /usr/sbin/groupdel
 Requires(pre): /usr/bin/getgid
@@ -181,7 +167,7 @@ Requires:   libvncserver >= 0.9.9
 Requires:      udev-core
 Provides:      group(vbox)
 Obsoletes:     VirtualBox-udev < 4.2.10-5
-ExclusiveArch: %{ix86} %{x8664}
+ExclusiveArch: %{ix86} %{x8664} x32
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %ifarch %{x8664}
@@ -424,11 +410,9 @@ Requires(post,postun):     /sbin/depmod\
 Requires(post):        systemd-units >= 38\
 Requires:      dev >= 2.9.0-7\
 Requires:      systemd-units >= 38\
-%if %{with dist_kernel}\
 %requires_releq_kernel\
 Requires:      %{releq_kernel -n drm}\
 Requires(postun):      %releq_kernel\
-%endif\
 Provides:      kernel(vboxguest) = %{version}-%{rel}\
 Provides:      kernel(vboxsf) = %{version}-%{rel}\
 Provides:      kernel(vboxvideo) = %{version}-%{rel}\
@@ -453,10 +437,8 @@ Group:             Base/Kernel\
 Requires(post,postun): /sbin/depmod\
 Requires(post):        systemd-units >= 38\
 Requires:      dev >= 2.9.0-7\
-%if %{with dist_kernel}\
 %requires_releq_kernel\
 Requires(postun):      %releq_kernel\
-%endif\
 Requires:      systemd-units >= 38\
 Provides:      kernel(vboxdrv) = %{version}-%{rel}\
 Provides:      kernel(vboxnetadp) = %{version}-%{rel}\
@@ -526,7 +508,7 @@ cd ../..\
 %install_kernel_modules -D PLD-MODULE-BUILD/installed -m PLD-MODULE-BUILD/GuestDrivers/vboxvideo/vboxvideo -d misc\
 %{nil}
 
-%{?with_kernel:%{expand:%kpkg}}
+%{?with_kernel:%{expand:%create_kernel_packages}}
 
 %prep
 %setup -q -n %{pname}-%{version}
@@ -617,7 +599,7 @@ kmk %{?_smp_mflags}
 %{__cc} %{rpmcflags} %{rpmldflags} -Wall -Werror src/VBox/Additions/linux/sharedfolders/{mount.vboxsf.c,vbsfmount.c} -o mount.vboxsf
 %endif
 
-%{?with_kernel:%{expand:%bkpkg}}
+%{?with_kernel:%{expand:%build_kernel_packages}}
 
 %install
 rm -rf $RPM_BUILD_ROOT