From 415f26415807de8d32c245d22bb1aef777f3a7e294edc8a2d0561b5043f35c39 Mon Sep 17 00:00:00 2001 From: Michal Vyskocil Date: Tue, 26 Jun 2012 14:32:52 +0000 Subject: [PATCH] Accepting request 126203 from home:mvyskocil:branches:Virtualization - let it build with all versions of openjkd OBS-URL: https://build.opensuse.org/request/show/126203 OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=98 --- virtualbox.changes | 5 +++++ virtualbox.spec | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/virtualbox.changes b/virtualbox.changes index 30c06b8..c4a550e 100644 --- a/virtualbox.changes +++ b/virtualbox.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jun 26 14:02:32 UTC 2012 - mvyskocil@suse.cz + +- let it build with all versions of openjkd + ------------------------------------------------------------------- Thu Jun 21 20:01:20 UTC 2012 - mseben@gmail.com diff --git a/virtualbox.spec b/virtualbox.spec index b1f522f..557957f 100644 --- a/virtualbox.spec +++ b/virtualbox.spec @@ -34,7 +34,7 @@ BuildRequires: glibc-devel-static %endif #gsoap,libopenssl and java needed for building webservice BuildRequires: gsoap-devel -BuildRequires: java-1_6_0-openjdk-devel +BuildRequires: java-devel >= 1.6.0 BuildRequires: libgsoap-devel BuildRequires: libopenssl-devel # @@ -297,7 +297,7 @@ source env.sh # VBOX_PATH_PACKAGE_DOCS set propper path for link to pdf in .desktop file # VBOX_WITH_REGISTRATION_REQUEST= VBOX_WITH_UPDATE_REQUEST= just disable some functionality in gui echo "build basic parts" -/usr/bin/kmk %{?_smp_mfalgs} VBOX_JAVA_HOME=/usr/%{_lib}/jvm/java-1.6.0-openjdk-1.6.0/ VBOX_GCC_WERR= KBUILD_VERBOSE=2 VBOX_WITH_REGISTRATION_REQUEST= VBOX_WITH_UPDATE_REQUEST= TOOL_YASM_AS=yasm VBOX_PATH_PACKAGE_DOCS=/usr/share/doc/packages/virtualbox all +/usr/bin/kmk %{?_smp_mfalgs} VBOX_JAVA_HOME=/etc/alternatives/java_sdk_openjdk/ VBOX_GCC_WERR= KBUILD_VERBOSE=2 VBOX_WITH_REGISTRATION_REQUEST= VBOX_WITH_UPDATE_REQUEST= TOOL_YASM_AS=yasm VBOX_PATH_PACKAGE_DOCS=/usr/share/doc/packages/virtualbox all # # build kernel modules for guest and host (check novel-kmp package as example) # host modules : vboxdrv,vboxnetflt,vboxnetadp