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

Accepting request 57988 from Virtualization

Browse Source 
Accepted submit request 57988 from user mseben

OBS-URL: https://build.opensuse.org/request/show/57988
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/virtualbox?expand=0&rev=5
This commit is contained in:
Marcus Rückert 2011-01-14 01:42:53 +00:00 committed by Git OBS Bridge
commit 3b1bd192d9
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
virtualbox.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Jan 12 13:29:36 UTC 2011 - mseben@gmail.com
- fix typo in spec file, which breaks loading of vboxsf kernel
module on guest
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jan 5 08:16:35 UTC 2011 - mseben@gmail.com Wed Jan 5 08:16:35 UTC 2011 - mseben@gmail.com

17
virtualbox.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package virtualbox (Version 4.0.0) # 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
@ -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: 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 BuildRequires: LibVNCServer-devel gcc43-c++ kbuild pam-devel udev
%if %suse_version > 1110 %if %suse_version > 1110
BuildRequires: zlib-devel-static BuildRequires: zlib-devel-static
%endif %endif
%ifarch amd64 x86_64 ia32e em64t %ifarch amd64 x86_64 ia32e em64t
BuildRequires: hal-32bit BuildRequires: hal-32bit
@ -43,7 +43,7 @@ BuildRequires: gcc43-32bit libstdc++43-devel-32bit
# #
ExclusiveArch: %ix86 x86_64 ExclusiveArch: %ix86 x86_64
Version: 4.0.0 Version: 4.0.0
Release: 2 Release: 1
Summary: VirtualBox is an Emulator Summary: VirtualBox is an Emulator
License: GPLv2+ License: GPLv2+
Group: System/Emulators/PC Group: System/Emulators/PC
@ -118,6 +118,7 @@ Provides: %{name}-ose:/usr/lib/virtualbox/VirtualBox.so
Provides: %{name}-ose-qt = %version Provides: %{name}-ose-qt = %version
Obsoletes: %{name}-ose-qt < %version Obsoletes: %{name}-ose-qt < %version
%description qt %description qt
Qt GUI part for %{name}. Qt GUI part for %{name}.
######################################### #########################################
@ -170,7 +171,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}
@ -256,14 +256,14 @@ for vbox_module in out/linux.*/release/bin/src/vbox{drv,netflt,netadp} \
# copy sources which will be used to build vbox module in last step # copy sources which will be used to build vbox module in last step
%__cp -r $vbox_module/ modules_build_dir/$flavor/ %__cp -r $vbox_module/ modules_build_dir/$flavor/
# copy vboxdrv (for host) and vboxguest (for guest) module symbols: # copy vboxdrv (for host) module symbols which are used by vboxnetflt and vboxnetadp km's:
if [ "$module_name" = "vboxnetflt" -o \ if [ "$module_name" = "vboxnetflt" -o \
"$module_name" = "vboxnetadp" ]; then "$module_name" = "vboxnetadp" ]; then
%__cp $PWD/modules_build_dir/$flavor/vboxdrv/Module.symvers \ %__cp $PWD/modules_build_dir/$flavor/vboxdrv/Module.symvers \
$PWD/modules_build_dir/$flavor/$module_name $PWD/modules_build_dir/$flavor/$module_name
fi fi
# copy vboxguest (for guest) module symbols which are used by vboxsf km:
if [ "$modulename" = "vboxsf" ]; then if [ "$module_name" = "vboxsf" ]; then
%__cp $PWD/modules_build_dir/$flavor/vboxguest/Module.symvers \ %__cp $PWD/modules_build_dir/$flavor/vboxguest/Module.symvers \
$PWD/modules_build_dir/$flavor/$module_name $PWD/modules_build_dir/$flavor/$module_name
fi fi
@ -611,7 +611,6 @@ exit 0
%config %{_sysconfdir}/init.d/vboxadd %config %{_sysconfdir}/init.d/vboxadd
%{_sbindir}/rcvboxadd %{_sbindir}/rcvboxadd
# #
%files -n python-%{name} %files -n python-%{name}
%defattr(-,root, root) %defattr(-,root, root)
%dir %{_vbox_instdir}/sdk %dir %{_vbox_instdir}/sdk