Accepting request 108494 from Virtualization

- Drop unnecessary xorg-x11-libs-32bit buildrequires
- Fix build with linux kernel 3.3 

- remove build date from VBoxSVC

OBS-URL: https://build.opensuse.org/request/show/108494
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/virtualbox?expand=0&rev=46

kernel-3.3.patch

@@ -0,0 +1,43 @@
+Index: VirtualBox-4.1.8_OSE/src/VBox/Additions/linux/drm/vboxvideo_drm.c
+===================================================================
+--- VirtualBox-4.1.8_OSE.orig/src/VBox/Additions/linux/drm/vboxvideo_drm.c
++++ VirtualBox-4.1.8_OSE/src/VBox/Additions/linux/drm/vboxvideo_drm.c
+@@ -86,6 +86,20 @@ int vboxvideo_driver_load(struct drm_dev
+ #endif
+ }
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0)
++/* since linux-3.3.0-rc1 drm_driver::fops is pointer */
++static struct file_operations driver_fops =
++{
++        .owner = THIS_MODULE,
++        .open = drm_open,
++        .release = drm_release,
++        .unlocked_ioctl = drm_ioctl,
++        .mmap = drm_mmap,
++        .poll = drm_poll,
++        .fasync = drm_fasync,
++};
++#endif
++
+ static struct drm_driver driver =
+ {
+     /* .driver_features = DRIVER_USE_MTRR, */
+@@ -96,6 +110,7 @@ static struct drm_driver driver =
+     .get_map_ofs = drm_core_get_map_ofs,
+     .get_reg_ofs = drm_core_get_reg_ofs,
+ #endif
++# if LINUX_VERSION_CODE < KERNEL_VERSION(3,3,0)
+     .fops =
+     {
+         .owner = THIS_MODULE,
+@@ -112,6 +127,9 @@ static struct drm_driver driver =
+         .poll = drm_poll,
+         .fasync = drm_fasync,
+     },
++#else /* LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0) */
++    .fops = &driver_fops,
++#endif
+ #if LINUX_VERSION_CODE < KERNEL_VERSION (2, 6, 39)
+     .pci_driver =
+     {

vbox-no-build-dates.diff

@@ -191,3 +191,42 @@ Index: src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c
  #if !defined(_PRODUCTION)
  #define _PRODUCTION ""
  #endif
+Index: src/VBox/Frontends/VBoxBalloonCtrl/VBoxBalloonCtrl.cpp
+===================================================================
+--- src/VBox/Frontends/VBoxBalloonCtrl/VBoxBalloonCtrl.cpp.orig
++++ src/VBox/Frontends/VBoxBalloonCtrl/VBoxBalloonCtrl.cpp
+@@ -1110,7 +1110,7 @@ static void logHeaderFooter(PRTLOGGER pL
+ #endif
+                    "Log opened %s\n",
+                    VBOX_VERSION_STRING, RTBldCfgRevision(), VBOX_BUILD_TARGET,
+-                   __DATE__, __TIME__, szTmp);
++                   "openSUSE", "Buildservice", szTmp);
+ 
+             int vrc = RTSystemQueryOSInfo(RTSYSOSINFO_PRODUCT, szTmp, sizeof(szTmp));
+             if (RT_SUCCESS(vrc) || vrc == VERR_BUFFER_OVERFLOW)
+Index: src/VBox/Main/src-server/Logging.cpp
+===================================================================
+--- src/VBox/Main/src-server/Logging.cpp.orig
++++ src/VBox/Main/src-server/Logging.cpp
+@@ -51,7 +51,7 @@ static void vboxsvcHeaderFooter(PRTLOGGE
+ #endif
+                    "Log opened %s\n",
+                    VBOX_VERSION_STRING, RTBldCfgRevision(), VBOX_BUILD_TARGET,
+-                   __DATE__, __TIME__, szTmp);
++                   "openSUSE", "Buildservice", szTmp);
+ 
+             int vrc = RTSystemQueryOSInfo(RTSYSOSINFO_PRODUCT, szTmp, sizeof(szTmp));
+             if (RT_SUCCESS(vrc) || vrc == VERR_BUFFER_OVERFLOW)
+Index: src/VBox/Main/webservice/vboxweb.cpp
+===================================================================
+--- src/VBox/Main/webservice/vboxweb.cpp.orig
++++ src/VBox/Main/webservice/vboxweb.cpp
+@@ -666,7 +666,7 @@ static void WebLogHeaderFooter(PRTLOGGER
+ #endif
+                    "Log opened %s\n",
+                    VBOX_VERSION_STRING, RTBldCfgRevision(), VBOX_BUILD_TARGET,
+-                   __DATE__, __TIME__, szTmp);
++                   "openSUSE", "Buildservice", szTmp);
+ 
+             int vrc = RTSystemQueryOSInfo(RTSYSOSINFO_PRODUCT, szTmp, sizeof(szTmp));
+             if (RT_SUCCESS(vrc) || vrc == VERR_BUFFER_OVERFLOW)

virtualbox.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Thu Mar  8 15:16:01 UTC 2012 - idonmez@suse.com
+
+- Drop unnecessary xorg-x11-libs-32bit buildrequires
+- Fix build with linux kernel 3.3 
+
+-------------------------------------------------------------------
+Tue Feb 21 07:49:52 UTC 2012 - seife+obs@b1-systems.com
+
+- remove build date from VBoxSVC
+
 -------------------------------------------------------------------
 Wed Dec 28 11:01:04 UTC 2011 - mseben@gmail.com
 

virtualbox.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package virtualbox
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 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
@@ -29,46 +29,45 @@ BuildRequires:  hal-devel
 %if %suse_version >= 1210
 BuildRequires:  glibc-devel-static
 %endif
+BuildRequires:  LibVNCServer-devel
+BuildRequires:  SDL-devel
 BuildRequires:  bin86
+BuildRequires:  boost-devel
 BuildRequires:  dev86
+BuildRequires:  e2fsprogs-devel
+BuildRequires:  gcc
+BuildRequires:  gcc-c++
+BuildRequires:  kbuild
+BuildRequires:  kernel-syms
+BuildRequires:  libcap-devel
+BuildRequires:  libcurl-devel
 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:  pam-devel
-BuildRequires:  libcap-devel
-BuildRequires:  libcurl-devel
-BuildRequires:  python-devel
-BuildRequires:  update-desktop-files
 BuildRequires:  pulseaudio-devel
+BuildRequires:  python-devel
+BuildRequires:  quilt
+BuildRequires:  udev
+BuildRequires:  update-desktop-files
 BuildRequires:  xorg-x11
 BuildRequires:  xorg-x11-devel
 BuildRequires:  xorg-x11-server
 BuildRequires:  xorg-x11-server-sdk
-BuildRequires:  LibVNCServer-devel
+BuildRequires:  yasm
-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
 #drop hal dependency
 %if %suse_version < 1210
 BuildRequires:  hal-32bit
 %endif	
-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
+BuildRequires:  xorg-x11-libX11-devel-32bit
+BuildRequires:  xorg-x11-libXext-devel-32bit
+BuildRequires:  xorg-x11-libXmu-devel-32bit
+BuildRequires:  xorg-x11-libXt-devel-32bit
 %endif
 #
 ExclusiveArch:  %ix86 x86_64
@@ -120,8 +119,10 @@ Patch99:        vbox-permissions_warning.diff
 #PATCH-FIX-OPENSUSE Do not include build dates on binaries, makes build-compare happier
 Patch100:       vbox-no-build-dates.diff
 Patch101:       vbox-default-os-type.diff
+# PATCH-FIX-UPSTREAM Compile with 3.3.0 kernel
+Patch102:       kernel-3.3.patch
 #disable update in vbox gui
-Patch102:       vbox-disable-updates.diff
+Patch103:       vbox-disable-updates.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 PreReq:         pwdutils permissions
 Requires:       %{name}-host-kmp = %version
@@ -233,7 +234,8 @@ Development file for %{name}
 %patch99 -p1
 %patch100 
 %patch101
-%patch102 
+%patch102 -p1
+%patch103
 #copy user manual
 %__cp %{S:1} ./UserManual.pdf