From 99057248bfb8a1a0468ec9246aa60034e0b13c3ff37849b78f952494094727e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Wed, 7 Dec 2011 10:41:35 +0000 Subject: [PATCH] Accepting request 95707 from devel:openSUSE:Factory:for-legal - fix license to be in spdx.org format OBS-URL: https://build.opensuse.org/request/show/95707 OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=70 --- virtualbox.changes | 5 +++++ virtualbox.spec | 56 ++++++++++++++++++++++++++++++---------------- 2 files changed, 42 insertions(+), 19 deletions(-) diff --git a/virtualbox.changes b/virtualbox.changes index a8fb493..5f0d7e4 100644 --- a/virtualbox.changes +++ b/virtualbox.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +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 diff --git a/virtualbox.spec b/virtualbox.spec index 017abc2..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.6 -Release: 1 +Release: 0 Summary: VirtualBox is an Emulator -License: GPLv2+ +License: GPL-2.0+ Group: System/Emulators/PC Url: http://www.virtualbox.org/ # @@ -115,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} @@ -132,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 @@ -142,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 @@ -152,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 @@ -166,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 @@ -191,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}