diff --git a/virtualbox-guest-preamble b/virtualbox-guest-preamble index 34d78f9..42724b2 100644 --- a/virtualbox-guest-preamble +++ b/virtualbox-guest-preamble @@ -1,5 +1,8 @@ Requires: kernel-%1 Provides: virtualbox-guest-kmp = %version #rename from ose version: -Provides: virtualbox-ose-guest-kmp-%1 = %version +Provides: virtualbox-ose-guest-kmp-%1 = %version Obsoletes: virtualbox-ose-guest-kmp-%1 < %version +#host (vboxdrv) and guest (vboxguest) kmp exports the same symbol (RTMemFreeEx) +#which break loading modules using modprobe (bnc#661740) +Conflicts: virtualbox-ose-host-kmp diff --git a/virtualbox-host-preamble b/virtualbox-host-preamble index 7dea019..1420a5e 100644 --- a/virtualbox-host-preamble +++ b/virtualbox-host-preamble @@ -3,3 +3,6 @@ Provides: virtualbox-host-kmp = %version #rename from ose version: Provides: virtualbox-ose-host-kmp-%1 = %version Obsoletes: virtualbox-ose-host-kmp-%1 < %version +#host (vboxdrv) and guest (vboxguest) kmp exports the same symbol (RTMemFreeEx) +#which break loading modules using modprobe (bnc#661740) +Conflicts: virtualbox-ose-guest-kmp diff --git a/virtualbox.changes b/virtualbox.changes index 1497672..96098e1 100644 --- a/virtualbox.changes +++ b/virtualbox.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Mar 25 07:42:21 UTC 2011 - mseben@gmail.com + +- added Conflicts: virtualbox-ose-*-kmp for kmp packages, because + host (vboxdrv) and guest (vboxguest) kmp exports the same + symbol (RTMemFreeEx) which breaks loading modules using + modprobe (bnc#661740) + ------------------------------------------------------------------- Thu Mar 17 13:17:54 UTC 2011 - mseben@gmail.com diff --git a/virtualbox.spec b/virtualbox.spec index effb226..80146ad 100644 --- a/virtualbox.spec +++ b/virtualbox.spec @@ -1,7 +1,7 @@ # -# spec file for package virtualbox +# spec file for package virtualbox (Version 3.9.80) # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -32,7 +32,7 @@ BuildRequires: e2fsprogs-devel libcap-devel libcurl-devel python-devel update-d BuildRequires: hal-devel pulseaudio-devel xorg-x11 xorg-x11-devel xorg-x11-server xorg-x11-server-sdk BuildRequires: LibVNCServer-devel gcc43-c++ kbuild pam-devel udev %if %suse_version > 1110 -BuildRequires: zlib-devel-static +BuildRequires: zlib-devel-static %endif %ifarch amd64 x86_64 ia32e em64t BuildRequires: hal-32bit @@ -43,7 +43,7 @@ BuildRequires: gcc43-32bit libstdc++43-devel-32bit # ExclusiveArch: %ix86 x86_64 Version: 4.0.4 -Release: 3 +Release: 1 Summary: VirtualBox is an Emulator License: GPLv2+ Group: System/Emulators/PC @@ -92,7 +92,7 @@ Patch99: vbox-permissions_warning.diff Patch100: vbox-no-build-dates.diff Patch101: vbox-default-os-type.diff #disable update in vbox gui -Patch102: vbox-disable-updates.diff +Patch102: vbox-disable-updates.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: pwdutils permissions Requires: %{name}-host-kmp = %version @@ -176,7 +176,6 @@ VirtualBox guest addition tools. ########################################### %package -n python-%{name} - Summary: Python bindings for %{name} Group: Development/Libraries/Python Requires: %{name} = %{version} @@ -443,6 +442,7 @@ popd #install wrapper script %__install -m 644 %{S:9} %{buildroot}%{_bindir}/VirtualBox + # modify and install the vboxdrv init script # TODO: some of this stuff breaks the fillup macros below? %__sed -i "s|%NOLSB%|yes|g;s|%DEBIAN%||g;s|%PACKAGE%|virtualbox|g" src/VBox/Installer/linux/vboxdrv.sh.in @@ -457,6 +457,8 @@ popd %__install -d -m 755 %{buildroot}%{_var}/adm/fillup-templates install -m 700 %{S:13} %{buildroot}%{_var}/adm/fillup-templates/sysconfig.vbox + + ###################################################### echo "entrering python-virtualbox install section" ###################################################### @@ -510,6 +512,7 @@ groupadd -r vboxusers 2>/dev/null || : %run_permissions %endif + %verifyscript %if %suse_version >=1140 %verify_permissions -e %{_vbox_instdir}/VBoxNetDHCP @@ -542,6 +545,7 @@ exit 0 %restart_on_update vboxadd %insserv_cleanup + %clean [ -d "%{buildroot}" -a "%{buildroot}" != "" ] && %__rm -rf "%{buildroot}" @@ -616,7 +620,6 @@ exit 0 %verify(not mode) %attr(0755,root,vboxusers) %{_vbox_instdir}/VBoxHeadless %verify(not mode) %attr(0755,root,vboxusers) %{_vbox_instdir}/VBoxSDL # - %files qt %defattr(-, root, root) %{_vbox_instdir}/VBoxPermissionMessage