diff --git a/VirtualBox-4.1.4-UserManual.pdf b/VirtualBox-4.1.4-UserManual.pdf deleted file mode 100644 index 88e11ab..0000000 --- a/VirtualBox-4.1.4-UserManual.pdf +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ae4bb67e8eead8d315ab8daa11385278a2701d7973c921bf066b16ca5759a8f3 -size 5028555 diff --git a/VirtualBox-4.1.4-patched.tar.bz2 b/VirtualBox-4.1.4-patched.tar.bz2 deleted file mode 100644 index b372787..0000000 --- a/VirtualBox-4.1.4-patched.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ae7510bf8b630431154cbab94b4c055cb18ee96d8ae9f2d329e63905dc05dcba -size 46592322 diff --git a/VirtualBox-4.1.6-UserManual.pdf b/VirtualBox-4.1.6-UserManual.pdf new file mode 100644 index 0000000..4190d16 --- /dev/null +++ b/VirtualBox-4.1.6-UserManual.pdf @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cd4c63d64d1dc77e2b52eb665005577ee65bc052fbf4b50b46230f5ee4564d5f +size 5036327 diff --git a/VirtualBox-4.1.6-patched.tar.bz2 b/VirtualBox-4.1.6-patched.tar.bz2 new file mode 100644 index 0000000..eaa8440 --- /dev/null +++ b/VirtualBox-4.1.6-patched.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:85348056dea26819d604580bce4af1d174e49cdd71e622ca8d765ad5b9ebc8ae +size 46586780 diff --git a/vbox-VBE_DISPI_INDEX_ENABLE.diff b/vbox-VBE_DISPI_INDEX_ENABLE.diff deleted file mode 100644 index c96bf7e..0000000 --- a/vbox-VBE_DISPI_INDEX_ENABLE.diff +++ /dev/null @@ -1,13 +0,0 @@ -Index: VirtualBox-4.1.4_OSE/src/VBox/Additions/common/VBoxVideo/Modesetting.cpp -=================================================================== ---- VirtualBox-4.1.4_OSE.orig/src/VBox/Additions/common/VBoxVideo/Modesetting.cpp -+++ VirtualBox-4.1.4_OSE/src/VBox/Additions/common/VBoxVideo/Modesetting.cpp -@@ -174,7 +174,7 @@ RTDECL(bool) VBoxVideoGetModeRegisters(u - uint16_t fFlags; - - VBoxVideoCmnPortWriteUshort(VBE_DISPI_IOPORT_INDEX, -- VBE_DISPI_ENABLED); -+ VBE_DISPI_INDEX_ENABLE); - fFlags = VBoxVideoCmnPortReadUshort(VBE_DISPI_IOPORT_DATA); - if (pcWidth) - { diff --git a/vbox-disable_vboxpci_build.diff b/vbox-disable_vboxpci_build.diff deleted file mode 100644 index be6b5b8..0000000 --- a/vbox-disable_vboxpci_build.diff +++ /dev/null @@ -1,23 +0,0 @@ -Index: src/VBox/HostDrivers/VBoxPci/Makefile.kmk -=================================================================== ---- src/VBox/HostDrivers/VBoxPci/Makefile.kmk.orig -+++ src/VBox/HostDrivers/VBoxPci/Makefile.kmk -@@ -17,7 +17,9 @@ - - SUB_DEPTH = ../../../.. - include $(KBUILD_PATH)/subheader.kmk -+ - if1of ($(KBUILD_TARGET), linux) -+ifdef VBOX_WITH_VBOXDRV - - # - # The driver. -@@ -41,7 +43,7 @@ if1of ($(KBUILD_TARGET), linux) - VBoxPci_LIBS += \ - $(PATH_STAGE_LIB)/SUPR0IdcClient$(VBOX_SUFF_LIB) - -- -+endif - # - # Install the sources. - # diff --git a/virtualbox-4.1.4-rpmlintrc b/virtualbox-4.1.6-rpmlintrc similarity index 100% rename from virtualbox-4.1.4-rpmlintrc rename to virtualbox-4.1.6-rpmlintrc diff --git a/virtualbox.changes b/virtualbox.changes index aa0628c..5f0d7e4 100644 --- a/virtualbox.changes +++ b/virtualbox.changes @@ -1,3 +1,30 @@ +------------------------------------------------------------------- +Wed Dec 7 10:39:02 UTC 2011 - coolo@suse.com + +- fix license to be in spdx.org format + +------------------------------------------------------------------- +Wed Nov 16 09:44:55 UTC 2011 - mseben@gmail.com + +- dropped vbox-VBE_DISPI_INDEX_ENABLE.diff and vbox-disable_vboxpci_build.diff +- update to virtualbox 4.1.6 + * VRDP: fixed screen corruption + * NAT: the interface stopped working after a lot of failed ICMP requests (bug #9371) + * E1000: fixed rare Windows 7 guest hangs, either at boot time or when reconfiguring the network card in unusual setups (bug #6223) + * ATA: fixed a possible crash during ATAPI passthrough with certain guests + * ATA: improved compatibility with ancient Linux kernels + * Main: fixed incorrect framebuffer information after leaving the fullscreen mode with X11 guests, this lead to a scrambled preview window in the GUI for example + * Mac OS X hosts: fixed the problem with duplicate packets when bridged to a wireless interface (bug #9648) + * Linux hosts: fix for 3D support on Fedora 15 (bug #9799) + * Linux hosts: don't call del_timer_sync from an interrupt context (Fedora bug report 746331) + * Windows Vista and 7 guests: more WDDM fixes + * Linux Additions: fixed kernel module compilation failure on Redhat Enterprise Linux 4 (bug #9709) + * Linux Additions: install the DRI driver correctly on Ubuntu 11.10 guests + * Solaris Additions: added read-only mmap support for shared folders + * Solaris Additions: added directory, file mode and mask options for shared folders + * Windows Additions: implemented faster detection of logged-in guest users and stale sessions + * X.Org Additions: fixed graphical corruption when switching to a virtual terminal (bug #9490) + ------------------------------------------------------------------- Wed Oct 19 10:03:10 UTC 2011 - idonmez@suse.com diff --git a/virtualbox.spec b/virtualbox.spec index cb5a9e9..9a97ae3 100644 --- a/virtualbox.spec +++ b/virtualbox.spec @@ -15,13 +15,12 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - %define _vbox_instdir /usr/lib/virtualbox Name: virtualbox +BuildRequires: acpica +BuildRequires: dmidecode BuildRequires: fdupes -BuildRequires: acpica dmidecode #drop hal dependency %if %suse_version < 1210 BuildRequires: hal-devel @@ -29,11 +28,32 @@ BuildRequires: hal-devel %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: bin86 +BuildRequires: dev86 +BuildRequires: libidl-devel +BuildRequires: libqt4-devel +BuildRequires: libxslt-devel +BuildRequires: yasm +BuildRequires: SDL-devel +BuildRequires: kernel-syms +BuildRequires: module-init-tools +BuildRequires: e2fsprogs-devel +BuildRequires: libcap-devel +BuildRequires: libcurl-devel +BuildRequires: python-devel +BuildRequires: update-desktop-files +BuildRequires: pulseaudio-devel +BuildRequires: xorg-x11 +BuildRequires: xorg-x11-devel +BuildRequires: xorg-x11-server +BuildRequires: xorg-x11-server-sdk +BuildRequires: LibVNCServer-devel +BuildRequires: gcc +BuildRequires: gcc-c++ +BuildRequires: kbuild +BuildRequires: pam-devel +BuildRequires: quilt +BuildRequires: udev BuildRequires: boost-devel BuildRequires: zlib-devel-static %ifarch amd64 x86_64 ia32e em64t @@ -41,16 +61,20 @@ BuildRequires: zlib-devel-static %if %suse_version < 1210 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: xorg-x11-libX11-devel-32bit +BuildRequires: xorg-x11-libXt-devel-32bit +BuildRequires: xorg-x11-libs-32bit +BuildRequires: xorg-x11-libXext-devel-32bit +BuildRequires: xorg-x11-libXmu-devel-32bit +BuildRequires: gcc-32bit +BuildRequires: gcc-c++-32bit %endif # ExclusiveArch: %ix86 x86_64 -Version: 4.1.4 -Release: 1 +Version: 4.1.6 +Release: 0 Summary: VirtualBox is an Emulator -License: GPLv2+ +License: GPL-2.0+ Group: System/Emulators/PC Url: http://www.virtualbox.org/ # @@ -89,11 +113,6 @@ Patch5: vbox-config.diff Patch6: vbox-smc-napa.diff #fix build of Python and dev package on openSUSE 11.3 Patch8: vbox-python-detection.diff -#fix Broken Linux console after starting X bnc#717713 -#patch grabbed from upstream ticket https://www.virtualbox.org/ticket/9490 -Patch9: vbox-VBE_DISPI_INDEX_ENABLE.diff -#fix build -Patch10: vbox-disable_vboxpci_build.diff #PATCH-FIX-OPENSUSE implement messagebox (VBoxPermissionMessage app), which is displayed, when user #try to start VirtualBox and is not memeber of vboxusers group Patch99: vbox-permissions_warning.diff @@ -120,7 +139,6 @@ that is freely available as Open Source Software under the terms of the GNU Public License (GPL). ########################################## %package qt -License: GPLv2+ Summary: Qt GUI part for %{name} Group: System/Emulators/PC Requires: %{name} = %{version} @@ -137,7 +155,6 @@ PreReq: permissions Qt GUI part for %{name}. ######################################### %package host-KMP -License: GPLv2+ Summary: Host kernel module for VirtualBox Group: System/Emulators/PC # SUSE specify macro to define host kmp package @@ -147,7 +164,6 @@ Group: System/Emulators/PC This package contains the kernel-module for VirtualBox. ########################################## %package guest-KMP -License: GPLv2+ Summary: Guest kernel modules for VirtualBox Group: System/Emulators/PC #SUSE specify macro to define guest kmp package @@ -157,7 +173,6 @@ Group: System/Emulators/PC This package contains the kernel-module for VirtualBox. ########################################## %package guest-x11 -License: GPLv2+ Summary: VirtualBox X11 drivers for mouse and video Group: System/X11/Servers/XF86_4 Requires: %{name}-guest-kmp = %version @@ -171,7 +186,6 @@ VirtualBox This package contains X11 guest utilities and X11 guest mouse and video drivers ########################################### %package guest-tools -License: GPLv2+ Summary: VirtualBox guest tools Group: System/Emulators/PC Requires: %{name}-guest-kmp = %version @@ -196,7 +210,6 @@ Obsoletes: python-%{name}-ose < %version Python XPCOM bindings to %{name}. Used e.g. by vboxgtk package. ########################################### %package devel -License: GPLv2+ Summary: Devel files for %{name} Group: Development/Libraries/Other Requires: %{name} = %{version} @@ -216,13 +229,10 @@ Development file for %{name} %patch5 -p1 %patch6 -p1 %patch8 -p1 -%patch9 -p1 -%patch10 %patch99 -p1 %patch100 %patch101 %patch102 -#%patch103 -p1 #copy user manual %__cp %{S:1} ./UserManual.pdf