forked from pool/virtualbox
Autobuild autoformatter for 61743
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/virtualbox?expand=0&rev=17
This commit is contained in:
Ruediger Oertel
Git OBS Bridge
parent
d0ce911287
commit
2240c02353
@ -1,60 +0,0 @@
|
||||
--- include/iprt/types.h.orig
|
||||
+++ include/iprt/types.h
|
||||
@@ -101,9 +101,6 @@ RT_C_DECLS_END
|
||||
# define true linux_true
|
||||
# define false linux_false
|
||||
# define uintptr_t linux_uintptr_t
|
||||
-# ifndef AUTOCONF_INCLUDED
|
||||
-# include <linux/autoconf.h>
|
||||
-# endif
|
||||
# include <linux/types.h>
|
||||
# include <linux/stddef.h>
|
||||
# undef uintptr_t
|
||||
--- src/VBox/HostDrivers/Support/SUPDrvInternal.h.orig
|
||||
+++ src/VBox/HostDrivers/Support/SUPDrvInternal.h
|
||||
@@ -75,9 +75,6 @@
|
||||
RT_C_DECLS_END
|
||||
|
||||
#elif defined(RT_OS_LINUX)
|
||||
-# ifndef AUTOCONF_INCLUDED
|
||||
-# include <linux/autoconf.h>
|
||||
-# endif
|
||||
# include <linux/version.h>
|
||||
# if defined(CONFIG_MODVERSIONS) && !defined(MODVERSIONS)
|
||||
# define MODVERSIONS
|
||||
--- src/VBox/Runtime/r0drv/linux/the-linux-kernel.h.orig
|
||||
+++ src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
|
||||
@@ -34,9 +34,6 @@
|
||||
#include <iprt/types.h>
|
||||
#define bool linux_bool
|
||||
|
||||
-#ifndef AUTOCONF_INCLUDED
|
||||
-# include <linux/autoconf.h>
|
||||
-#endif
|
||||
#include <linux/version.h>
|
||||
|
||||
/* We only support 2.4 and 2.6 series kernels */
|
||||
--- src/VBox/Runtime/include/internal/iprt.h.orig
|
||||
+++ src/VBox/Runtime/include/internal/iprt.h
|
||||
@@ -39,9 +39,6 @@
|
||||
&& defined(MODULE) \
|
||||
&& !defined(RT_NO_EXPORT_SYMBOL)
|
||||
# define bool linux_bool /* see r0drv/linux/the-linux-kernel.h */
|
||||
-# ifndef AUTOCONF_INCLUDED
|
||||
-# include <linux/autoconf.h>
|
||||
-# endif
|
||||
# if defined(CONFIG_MODVERSIONS) && !defined(MODVERSIONS)
|
||||
# include <linux/version.h>
|
||||
# define MODVERSIONS
|
||||
--- src/VBox/Additions/linux/drm/vboxvideo_drm.c.orig
|
||||
+++ src/VBox/Additions/linux/drm/vboxvideo_drm.c
|
||||
@@ -49,9 +49,6 @@
|
||||
* Gareth Hughes <gareth@valinux.com>
|
||||
*/
|
||||
|
||||
-#ifndef AUTOCONF_INCLUDED
|
||||
-# include <linux/autoconf.h>
|
||||
-#endif
|
||||
#include <linux/version.h>
|
||||
#include <linux/module.h>
|
||||
#include "version-generated.h"
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package virtualbox (Version 3.9.80)
|
||||
# spec file for package virtualbox
|
||||
#
|
||||
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2011 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
|
||||
@ -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: LibVNCServer-devel gcc43-c++ kbuild pam-devel udev
|
||||
%if %suse_version > 1110
|
||||
BuildRequires: zlib-devel-static
|
||||
BuildRequires: zlib-devel-static
|
||||
%endif
|
||||
%ifarch amd64 x86_64 ia32e em64t
|
||||
BuildRequires: hal-32bit
|
||||
@ -92,7 +92,7 @@ Patch99: vbox-permissions_warning.diff
|
||||
Patch100: vbox-no-build-dates.diff
|
||||
Patch101: vbox-default-os-type.diff
|
||||
#disable update in vbox gui
|
||||
Patch102: vbox-disable-updates.diff
|
||||
Patch102: vbox-disable-updates.diff
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
PreReq: pwdutils permissions
|
||||
Requires: %{name}-host-kmp = %version
|
||||
@ -120,7 +120,6 @@ Provides: %{name}-ose:/usr/lib/virtualbox/VirtualBox.so
|
||||
Provides: %{name}-ose-qt = %version
|
||||
Obsoletes: %{name}-ose-qt < %version
|
||||
|
||||
|
||||
%description qt
|
||||
Qt GUI part for %{name}.
|
||||
#########################################
|
||||
@ -173,6 +172,7 @@ VirtualBox guest addition tools.
|
||||
###########################################
|
||||
%package -n python-%{name}
|
||||
|
||||
|
||||
Summary: Python bindings for %{name}
|
||||
Group: Development/Libraries/Python
|
||||
Requires: %{name} = %{version}
|
||||
@ -439,7 +439,6 @@ 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
|
||||
@ -454,8 +453,6 @@ 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"
|
||||
######################################################
|
||||
@ -527,7 +524,6 @@ exit 0
|
||||
%verify_permissions -e %{_vbox_instdir}/VBoxBFE -e %{_vbox_instdir}/VBoxHeadless -e %{_vbox_instdir}/VBoxSDL -e %{_vbox_instdir}/VirtualBox
|
||||
%endif
|
||||
|
||||
|
||||
%clean
|
||||
[ -d "%{buildroot}" -a "%{buildroot}" != "" ] && %__rm -rf "%{buildroot}"
|
||||
|
||||
@ -600,6 +596,7 @@ exit 0
|
||||
#%verify(not mode) %attr(0755,root,vboxusers) %{_vbox_instdir}/VBoxNetDHCP
|
||||
%{_vbox_instdir}/VBoxNetDHCP
|
||||
#
|
||||
|
||||
%files qt
|
||||
%defattr(-, root, root)
|
||||
%{_vbox_instdir}/VBoxPermissionMessage
|
||||
|
||||
Loading…
Reference in New Issue
Block a user