jengelh/virtualbox
SHA256
1
0
Fork 0
forked from pool/virtualbox
Code Pull Requests Activity

Accepting request 66663 from Virtualization

Browse Source 
Accepted submit request 66663 from user coolo

OBS-URL: https://build.opensuse.org/request/show/66663
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/virtualbox?expand=0&rev=22
This commit is contained in:
Sascha Peilicke 2011-04-11 08:47:36 +00:00 committed by Git OBS Bridge
commit 251fbc1c92
4 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
virtualbox-guest-preamble
View File

@ -3,3 +3,6 @@ Provides: virtualbox-guest-kmp = %version
#rename from ose 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 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

3
virtualbox-host-preamble
View File

@ -3,3 +3,6 @@ Provides: virtualbox-host-kmp = %version
#rename from ose version: #rename from ose version:
Provides: virtualbox-ose-host-kmp-%1 = %version Provides: virtualbox-ose-host-kmp-%1 = %version
Obsoletes: 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

8
virtualbox.changes
View File

@ -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 Thu Mar 17 13:17:54 UTC 2011 - mseben@gmail.com

13
virtualbox.spec
View File

@ -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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -43,7 +43,7 @@ BuildRequires: gcc43-32bit libstdc++43-devel-32bit
# #
ExclusiveArch: %ix86 x86_64 ExclusiveArch: %ix86 x86_64
Version: 4.0.4 Version: 4.0.4
Release: 3 Release: 1
Summary: VirtualBox is an Emulator Summary: VirtualBox is an Emulator
License: GPLv2+ License: GPLv2+
Group: System/Emulators/PC Group: System/Emulators/PC
@ -176,7 +176,6 @@ VirtualBox guest addition tools.
########################################### ###########################################
%package -n python-%{name} %package -n python-%{name}
Summary: Python bindings for %{name} Summary: Python bindings for %{name}
Group: Development/Libraries/Python Group: Development/Libraries/Python
Requires: %{name} = %{version} Requires: %{name} = %{version}
@ -443,6 +442,7 @@ popd
#install wrapper script #install wrapper script
%__install -m 644 %{S:9} %{buildroot}%{_bindir}/VirtualBox %__install -m 644 %{S:9} %{buildroot}%{_bindir}/VirtualBox
# modify and install the vboxdrv init script # modify and install the vboxdrv init script
# TODO: some of this stuff breaks the fillup macros below? # 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 %__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 -d -m 755 %{buildroot}%{_var}/adm/fillup-templates
install -m 700 %{S:13} %{buildroot}%{_var}/adm/fillup-templates/sysconfig.vbox install -m 700 %{S:13} %{buildroot}%{_var}/adm/fillup-templates/sysconfig.vbox
###################################################### ######################################################
echo "entrering python-virtualbox install section" echo "entrering python-virtualbox install section"
###################################################### ######################################################
@ -510,6 +512,7 @@ groupadd -r vboxusers 2>/dev/null || :
%run_permissions %run_permissions
%endif %endif
%verifyscript %verifyscript
%if %suse_version >=1140 %if %suse_version >=1140
%verify_permissions -e %{_vbox_instdir}/VBoxNetDHCP %verify_permissions -e %{_vbox_instdir}/VBoxNetDHCP
@ -542,6 +545,7 @@ exit 0
%restart_on_update vboxadd %restart_on_update vboxadd
%insserv_cleanup %insserv_cleanup
%clean %clean
[ -d "%{buildroot}" -a "%{buildroot}" != "" ] && %__rm -rf "%{buildroot}" [ -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}/VBoxHeadless
%verify(not mode) %attr(0755,root,vboxusers) %{_vbox_instdir}/VBoxSDL %verify(not mode) %attr(0755,root,vboxusers) %{_vbox_instdir}/VBoxSDL
# #
%files qt %files qt
%defattr(-, root, root) %defattr(-, root, root)
%{_vbox_instdir}/VBoxPermissionMessage %{_vbox_instdir}/VBoxPermissionMessage