diff --git a/virtualbox.changes b/virtualbox.changes index 93bd6e6..2b6339f 100644 --- a/virtualbox.changes +++ b/virtualbox.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jun 20 09:09:34 UTC 2011 - aj@suse.de + +- Add BuildRequires: glibc-devel-static + ------------------------------------------------------------------- Tue May 31 06:45:32 UTC 2011 - mseben@gmail.com diff --git a/virtualbox.spec b/virtualbox.spec index 9173dd2..86ff1f4 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 @@ -28,13 +28,16 @@ BuildRequires: pmtools %endif #drop hal dependency %if %suse_version < 1210 -BuildRequires: hal-devel +BuildRequires: hal-devel +%endif +%if %suse_version >= 1210 +BuildRequires: glibc-devel-static %endif BuildRequires: bin86 dev86 libidl-devel libqt4-devel libxslt-devel yasm BuildRequires: SDL-devel kernel-syms module-init-tools BuildRequires: e2fsprogs-devel libcap-devel libcurl-devel python-devel update-desktop-files BuildRequires: pulseaudio-devel xorg-x11 xorg-x11-devel xorg-x11-server xorg-x11-server-sdk -BuildRequires: LibVNCServer-devel gcc gcc-c++ kbuild pam-devel quilt udev +BuildRequires: LibVNCServer-devel gcc gcc-c++ kbuild pam-devel udev quilt BuildRequires: boost-devel %if %suse_version > 1110 BuildRequires: zlib-devel-static @@ -46,12 +49,12 @@ BuildRequires: hal-32bit %endif BuildRequires: xorg-x11-libX11-devel-32bit xorg-x11-libXt-devel-32bit xorg-x11-libs-32bit BuildRequires: xorg-x11-libXext-devel-32bit xorg-x11-libXmu-devel-32bit -BuildRequires: gcc-32bit gcc-c++-32bit +BuildRequires: gcc-32bit gcc-c++-32bit %endif # ExclusiveArch: %ix86 x86_64 Version: 4.0.8 -Release: 3 +Release: 1 Summary: VirtualBox is an Emulator License: GPLv2+ Group: System/Emulators/PC @@ -186,7 +189,6 @@ VirtualBox guest addition tools. ########################################### %package -n python-%{name} - Summary: Python bindings for %{name} Group: Development/Libraries/Python Requires: %{name} = %{version} @@ -459,6 +461,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 @@ -473,6 +476,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" ###################################################### @@ -526,6 +531,7 @@ groupadd -r vboxusers 2>/dev/null || : %run_permissions %endif + %verifyscript %if %suse_version >=1140 %verify_permissions -e %{_vbox_instdir}/VBoxNetDHCP @@ -558,6 +564,7 @@ exit 0 %restart_on_update vboxadd %insserv_cleanup + %clean [ -d "%{buildroot}" -a "%{buildroot}" != "" ] && %__rm -rf "%{buildroot}" @@ -632,7 +639,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