VirtualBox: update to 5.2.4

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@11304 ec354946-7b23-47d6-9f5a-488ba84defc7

V/VirtualBox/VirtualBox-vl.spec

@@ -1,15 +1,15 @@
-%define version	5.0.26
-%define release	1%{?_dist_release}
+%define version 5.2.4
+%define release 1%{?_dist_release}
 
-%define kname	vboxdrv
-%define oname	VirtualBox
-%define srcname	%{oname}-%{version}
-%define distname	%{oname}-%{version}_OSE
+%define kname vboxdrv
+%define oname VirtualBox
+%define srcname %{oname}-%{version}
+%define distname %{oname}-%{version}_OSE
 %define dirname vbox-ose
-%define pkgver	%{version}
+%define pkgver %{version}
 
-%define vboxlibdir	%{_libdir}/%{name}
-%define vboxdatadir	%{_datadir}/%{name}
+%define vboxlibdir %{_libdir}/%{name}
+%define vboxdatadir %{_datadir}/%{name}
 
 %define build_additions 1
 %define build_doc 0
@@ -35,105 +35,121 @@
 %define xserverabi 16
 %endif
 
-Summary:	A general-purpose full virtualizer for x86 hardware
-Summary(ja):	汎用の x86 ハードウエア完全仮想化ソフトウエア
-Name:		VirtualBox
-Version:	%{version}
-Release:	%{release}
-License:	GPL
-Group:		Development/Tools
-Url:		http://www.virtualbox.org/
+Summary: A general-purpose full virtualizer for x86 hardware
+Summary(ja): 汎用の x86 ハードウエア完全仮想化ソフトウエア
+Name:  VirtualBox
+Version: %{version}
+Release: %{release}
+License: GPL
+Group:   Development/Tools
+Url:     http://www.virtualbox.org/
 
-Source0:	http://download.virtualbox.org/virtualbox/%ver/%{srcname}.tar.bz2
-Source2:	virtualbox.init.vine
-Source3:	vboxadd-timesync.vine
-Source4:	60-vboxadd.perms
-Source10:	VirtualBox.png
+Source0: http://download.virtualbox.org/virtualbox/%{version}/%{srcname}.tar.bz2
+Source1: http://download.virtualbox.org/virtualbox/%{version}/UserManual.pdf
 
-Source50:	os_vine.png
-Source51:	os_vine_64.png
+Source2: virtualbox.init.vine
+Source3: vboxadd-timesync.vine
+Source4: 60-vboxadd.perms
+Source10: VirtualBox.png
+
+Source50: os_vine.png
+Source51: os_vine_64.png
 
 # missing testcase required to get things going
-Source100:      https://www.virtualbox.org/download/testcase/nls/4.2/qt_fa_IR.ts
+Source100: https://www.virtualbox.org/download/testcase/nls/4.2/qt_fa_IR.ts
 
-Patch2:		VirtualBox-4.0.6-kernelrelease.patch
-Patch4:		VirtualBox-1.6.0_OSE-futex.patch
-Patch5:         virtualbox-fix-vboxadd-req.patch
-# (fc) 1.6.0-2mdv fix initscript name in VBox.sh script
-Patch6:		VirtualBox-5.0.26_OSE-initscriptname.patch
+Patch2: VirtualBox-4.0.6-kernelrelease.patch
+Patch4: VirtualBox-1.6.0_OSE-futex.patch
+Patch5: virtualbox-fix-vboxadd-req.patch
 # (hk) fix build kernel-headers-2.6.29*
-Patch10:	VirtualBox-kernel-headers-2.6.29.patch
+Patch10: VirtualBox-kernel-headers-2.6.29.patch
 # (fc) 2.2.0-1mdv disable update notification (Debian)
-Patch12:        16-no-update.patch
+Patch12: 16-no-update.patch
 # don't check for:
 # mkisofs: we're not going to build the additions .iso file
 # makeself: we're not going to create the stanalone .run installers
-Patch18:	virtualbox-5.0.26-dont-check-for-mkisofs-or-makeself.patch
+Patch18: virtualbox-5.0.26-dont-check-for-mkisofs-or-makeself.patch
 
 # fixed on upstream - will be included in future releases
 # see: http://www.virtualbox.org/ticket/9305
-Patch50:	VirtualBox-4.1.0-fix_kernel_panic_on_shutdown.patch
+Patch50: VirtualBox-4.1.0-fix_kernel_panic_on_shutdown.patch
 
 # vine
-Patch100:	VirtualBox-2.2.2-buildfix.patch
-Patch101:       VirtualBox-4.1.2-vboxpci-build.patch
-Patch110:	VirtualBox-4.3.10-vine.patch
-Patch120:	VirtualBox-5.0.26-add-templates.patch
-
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
-ExclusiveArch:	%{ix86} x86_64
-Requires:	dkms-%{name} = %{version}-%{release}
-BuildRequires:	dev86
+Patch100: VirtualBox-2.2.2-buildfix.patch
+Patch101: VirtualBox-4.1.2-vboxpci-build.patch
+Patch110: VirtualBox-5.1.18-vine.patch
+Patch120: VirtualBox-5.1.18-add-templates.patch
+Patch130: VirtualBox-5.1.18-build-fix-with-qt4.patch
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+ExclusiveArch: %{ix86} x86_64
+Requires: dkms-%{name} = %{version}-%{release}
+BuildRequires: dev86
 %if %{?_dist_release} >= "vl7"
 BuildRequires: acpica-tools
 %else
 BuildRequires: iasl
 %endif
-BuildRequires:	zlib-devel
-BuildRequires:	libXcursor-devel
-BuildRequires:	libXmu-devel
-BuildRequires:	SDL-devel
-BuildRequires:  qt4-devel
-BuildRequires:	libIDL-devel
-BuildRequires:  e2fsprogs-devel
-BuildRequires:	libxslt-devel
-BuildRequires:  xerces-c-devel, xalan-c-devel
-#BuildRequires:	hal-devel
-BuildRequires:  libXt-devel
-BuildRequires:  libstdc++-devel
+BuildRequires: zlib-devel
+BuildRequires: libXcursor-devel
+BuildRequires: libXmu-devel
+BuildRequires: libXinerama-devel
+BuildRequires: libXrandr-devel
+BuildRequires: libpng-devel
+BuildRequires: SDL-devel
 %if %{?_dist_release} >= "vl7"
-BuildRequires:  libstdc++-static
+BuildRequires: qt5-qtbase-devel
+BuildRequires: qt5-qtx11extras-devel
+BuildRequires: qt5-linguist
+%else
+BuildRequires: qt4-devel
 %endif
-BuildRequires:  python-devel
-BuildRequires:  libcap-devel
-BuildRequires:	pulseaudio-libs-devel
-BuildRequires:	kernel-devel
-BuildRequires:  mesa-libGL-devel
-BuildRequires:  mesa-libGLU-devel
-BuildRequires:	gsoap-devel
-BuildRequires:  curl-devel
-BuildRequires:  alsa-lib-devel
-BuildRequires:	dkms
+BuildRequires: libIDL-devel
+BuildRequires: e2fsprogs-devel
+BuildRequires: libxslt-devel
+BuildRequires: xerces-c-devel, xalan-c-devel
+#BuildRequires: hal-devel
+BuildRequires: libXt-devel
+BuildRequires: libstdc++-devel
+%if %{?_dist_release} >= "vl7"
+BuildRequires: libstdc++-static
+%endif
+BuildRequires: python-devel
+BuildRequires: libcap-devel
+BuildRequires: pulseaudio-libs-devel
+BuildRequires: kernel-devel
+BuildRequires: mesa-libGL-devel
+BuildRequires: mesa-libGLU-devel
+BuildRequires: gsoap-devel
+BuildRequires: curl-devel
+BuildRequires: alsa-lib-devel
+BuildRequires: dkms
 #BuildRequires:  kBuild >= 0.1.999
-BuildRequires:  yasm
-BuildRequires:  qt4-designer
-BuildRequires:  pam-devel
-BuildRequires:  device-mapper-devel
-BuildRequires:  libvpx-devel
+BuildRequires: yasm
+%if %{?_dist_release} == "vl6"
+BuildRequires: qt4-designer
+%endif
+BuildRequires: pam-devel
+BuildRequires: device-mapper-devel
+BuildRequires: libvpx-devel
 %ifarch x86_64
-BuildRequires:  compat32-glibc-devel
+BuildRequires: compat32-glibc-devel
 %endif
 %if %{?_dist_release} >= "vl7"
-BuildRequires:  java-1.7.0-openjdk-devel
+BuildRequires: java-1.8.0-openjdk-devel
 %else
-BuildRequires:  java-1.6.0-openjdk-devel
+BuildRequires: java-1.7.0-openjdk-devel
 %endif
 
 %if %{build_doc}
-BuildRequires:  task-texlive
-BuildRequires:  texlive-collection-fontsextra
+BuildRequires: task-texlive
+BuildRequires: texlive-collection-fontsextra
 %endif
 
+Vendor: Project Vine
+Distribution: Vine Linux
+
+
 %description
 VirtualBox Open Source Edition (OSE) is a general-purpose full
 virtualizer for x86 hardware.
@@ -142,11 +158,11 @@ virtualizer for x86 hardware.
 VirtualBox Open Source Edition (OSE) は汎用の x86 ハードウエア
 完全仮想化ソフトウエアです。
 
-%package -n	dkms-%{name}
-Summary:	VirtualBox OSE kernel module
+%package -n dkms-%{name}
+Summary: VirtualBox OSE kernel module
 Summary(ja):    VirtualBox OSE カーネルモジュール
-Group:		System Environment/Kernel
-Requires(post):	  dkms
+Group:  System Environment/Kernel
+Requires(post):   dkms
 Requires(preun):  dkms
 
 %description -n dkms-%{name}
@@ -156,19 +172,19 @@ Kernel support for VirtualBox OSE.
 VirtualBox OSE のカーネルサポートパッケージです。
 
 %if %{build_additions}
-%package 	guest-additions
-Summary:	Additions for VirtualBox OSE guest systems
-Summary(ja):	VirtualBox OSE ゲストシステム用の追加モジュール
-Group:		System Environment/Kernel
-Requires:	dkms-vboxadd = %{version}-%{release}
-Requires:	dkms-vboxvfs = %{version}-%{release}
-Requires:	dkms-vboxvideo = %{version}-%{release}
-#Requires:	xorg-x11-drv-vboxmouse
-Requires:	xorg-x11-drv-vboxvideo
-Requires:	xorg-x11-server-utils
-Obsoletes:	xorg-x11-drv-vboxmouse < 4.1.4
-
-%description    guest-additions
+%package guest-additions
+Summary: Additions for VirtualBox OSE guest systems
+Summary(ja): VirtualBox OSE ゲストシステム用の追加モジュール
+Group:  System Environment/Kernel
+Requires: dkms-vboxadd = %{version}-%{release}
+Requires: dkms-vboxvfs = %{version}-%{release}
+Requires: dkms-vboxvideo = %{version}-%{release}
+#Requires: xorg-x11-drv-vboxmouse
+Requires: xorg-x11-drv-vboxvideo
+Requires: xorg-x11-server-utils
+Obsoletes: xorg-x11-drv-vboxmouse < 4.1.4
+
+%description guest-additions
 This packages contains additions for VirtualBox OSE guest systems.
 It allows to share files with the host system, copy/paste between
 guest and host, and sync time with host.
@@ -179,18 +195,18 @@ guest and host, and sync time with host.
 たり、ゲスト/ホスト間でカット&ペーストを行ったり、ホストと時刻同期をし
 たりすることができます。
 
-%package -n	dkms-vboxadd
-Summary:	Kernel module for VirtualBox OSE additions
-Summary(ja):    VirtualBox OSE additions のカーネルモジュール
-Group:		System Environment/Kernel
-Requires(post):	  dkms
-Requires(preun):  dkms
-Provides:	dkms-vboxvfs = %{version}-%{release}
-Obsoletes:	dkms-vboxvfs < %{version}-%{release}
-Provides:       dkms-vboxsf = %{version}-%{release}
-Obsoletes:      dkms-vboxsf < %{version}-%{release}
-Provides:	dkms-vboxvideo = %{version}-%{release}
-Obsoletes:	dkms-vboxvideo < %{version}-%{release}
+%package -n dkms-vboxadd
+Summary: Kernel module for VirtualBox OSE additions
+Summary(ja): VirtualBox OSE additions のカーネルモジュール
+Group:  System Environment/Kernel
+Requires(post): dkms
+Requires(preun): dkms
+Provides:  dkms-vboxvfs = %{version}-%{release}
+Obsoletes: dkms-vboxvfs < %{version}-%{release}
+Provides:  dkms-vboxsf = %{version}-%{release}
+Obsoletes: dkms-vboxsf < %{version}-%{release}
+Provides:  dkms-vboxvideo = %{version}-%{release}
+Obsoletes: dkms-vboxvideo < %{version}-%{release}
 
 %description -n dkms-vboxadd
 Kernel module for VirtualBox OSE additions.
@@ -199,11 +215,11 @@ Kernel module for VirtualBox OSE additions.
 VirtualBox OSE 追加モジュールのためのカーネルモジュールです。
 
 %if 0
-%package -n	xorg-x11-drv-vboxmouse
-Summary:	X.org X11 input driver for VirtualBox mouse
-Summary:	X.org X11 VirtualBox マウス入力ドライバ
-Group:		User Interface/X Hardware Support
-Requires:	%{name}-guest-additions
+%package -n xorg-x11-drv-vboxmouse
+Summary: X.org X11 input driver for VirtualBox mouse
+Summary: X.org X11 VirtualBox マウス入力ドライバ
+Group:  User Interface/X Hardware Support
+Requires: %{name}-guest-additions
 
 %description -n xorg-x11-drv-vboxmouse
 The X.org driver for mouse in VirtualBox guests
@@ -212,11 +228,11 @@ The X.org driver for mouse in VirtualBox guests
 VirtualBox のゲストシステム用の X.org マウスドライバです。
 %endif
 
-%package -n	xorg-x11-drv-vboxvideo
-Summary:	X.org X11 video driver for VirtualBox guests
-Summary(ja):	X.org X11 VirtualBox ビデオドライバ
-Group:		User Interface/X Hardware Support
-Requires:	%{name}-guest-additions
+%package -n xorg-x11-drv-vboxvideo
+Summary: X.org X11 video driver for VirtualBox guests
+Summary(ja): X.org X11 VirtualBox ビデオドライバ
+Group: User Interface/X Hardware Support
+Requires: %{name}-guest-additions
 
 %description -n xorg-x11-drv-vboxvideo
 The X.org driver for video in VirtualBox guests
@@ -228,10 +244,9 @@ VirtualBox のゲストシステム用の X.org ビデオドライバです。
 
 %prep
 %setup -q
-%patch2 -p1 -b .kernelrelease
+# %patch2 -p1 -b .kernelrelease
 %patch4 -p1 -b .futex
 %patch5 -p1 -b .fix-timesync-req
-%patch6 -p1 -b .initscriptname
 %patch10 -p1 -b .kernel-headers-2.6.29
 #%patch12 -p1 -b .disable-update
 %patch18 -p1 -b .mkisofs-makeself
@@ -240,6 +255,7 @@ VirtualBox のゲストシステム用の X.org ビデオドライバです。
 #%patch101 -p1 -b .vboxpci-build
 %patch110 -p1 -b .vine
 %patch120 -p1 -b .add-templates
+# %patch130 -p1 -b .buildfix-qt4
 
 # add vine icons
 cp -f %{SOURCE50} %{SOURCE51} src/VBox/Frontends/VirtualBox/images/
@@ -269,9 +285,13 @@ EOF
 ./configure \
   --with-linux=$PWD/fake-linux \
   --disable-kmods \
+%if "%{_dist_release}" == "vl6"
+  --with-qt-dir=/usr/lib64/qt-4.7.2 \
+%endif
 %if ! %{build_doc}
   --disable-docs
 %endif
+  # --enable-qt4 \
 
 %if !%{build_additions}
 sed -rie 's/(VBOX_WITH_LINUX_ADDITIONS\s+:=\s+).*/\1/' AutoConfig.kmk
@@ -283,6 +303,9 @@ kmk KBUILD_VERBOSE=2 \
     TOOL_YASM_AS=yasm \
     VBOX_WITH_REGISTRATION_REQUEST= \
     VBOX_WITH_UPDATE_REQUEST= \
+    VBOX_WITH_DEBUGGER= \
+    VBOX_WITH_DEBUGGERGUI= \
+    VBOX_WITH_QTGUI_V5= \
     %{?_smp_mflags} all
 
 %install
@@ -307,6 +330,7 @@ cat > %{buildroot}%{_sysconfdir}/vbox/vbox.cfg << EOF
 # VirtualBox installation directory
 INSTALL_DIR="%{vboxlibdir}"
 EOF
+sed -i -e "s|/usr/lib/virtualbox|%{vboxlibdir}|g" %{buildroot}%{vboxdatadir}/VBox.sh
 mkdir -p %{buildroot}%{_bindir}
 ln -s %{vboxdatadir}/VBox.sh %{buildroot}%{_bindir}/%{name}
 ln -s %{vboxdatadir}/VBox.sh %{buildroot}%{_bindir}/VBoxManage
@@ -458,6 +482,9 @@ EOF
 # add missing makefile for kernel module
 install -m644 src/VBox/HostDrivers/Support/linux/Makefile %{buildroot}%{_usr}/src/%{name}-%{version}-%{release}/
 
+# add UserManual.pdf
+install -m644 %{SOURCE1} %{buildroot}/%{_datadir}/%{name}/
+
 # remove unpackaged files
 rm -rf %{buildroot}%{vboxlibdir}/{src,sdk,testcase}
 rm  -f %{buildroot}%{vboxlibdir}/tst*
@@ -471,17 +498,16 @@ rm -rf %{buildroot}
 %post
 /sbin/chkconfig --add virtualbox
 
-%postun
-if [ "$1" -ge "1" ]; then
-  /sbin/service virtualbox condrestart > /dev/null 2>&1 || :
-fi
-
 %preun
 if [ $1 = 0 ]; then
     service virtualbox stop > /dev/null 2>&1 ||:
     /sbin/chkconfig --del virtualbox
 fi
-	
+
+%postun
+if [ "$1" -ge "1" ]; then
+  /sbin/service virtualbox condrestart > /dev/null 2>&1 || :
+fi
 
 %post -n dkms-%{name}
 set -x
@@ -490,43 +516,50 @@ set -x
 /usr/sbin/dkms --rpm_safe_upgrade install -m %{name} -v %{version}-%{release} --force ||:
 /sbin/modprobe %{kname} >/dev/null 2>&1 || :
 /sbin/modprobe vboxnetflt >/dev/null 2>&1 || :
+/sbin/modprobe vboxnetadp >/dev/null 2>&1 || :
 
 %preun -n dkms-%{name}
+set -x
 # rmmod can fail
+/sbin/rmmod vboxnetadp >/dev/null 2>&1
 /sbin/rmmod vboxnetflt >/dev/null 2>&1
 /sbin/rmmod %{kname} >/dev/null 2>&1
-set -x
 /usr/sbin/dkms --rpm_safe_upgrade remove -m %{name} -v %{version}-%{release} --all || :
 
 %if %{build_additions}
 %post guest-additions
 /sbin/chkconfig --add vboxadd-timesync
 
-%postun guest-additions
-if [ "$1" -ge "1" ]; then
-  /sbin/service vboxadd-timesync condrestart > /dev/null 2>&1 || :
-fi
-
 %preun guest-additions
 if [ $1 = 0 ]; then
     service vboxadd-timesync stop > /dev/null 2>&1 ||:
     /sbin/chkconfig --del vboxadd-timesync
 fi
 
+%postun guest-additions
+if [ "$1" -ge "1" ]; then
+  /sbin/service vboxadd-timesync condrestart > /dev/null 2>&1 || :
+fi
+
 %post -n dkms-vboxadd
 set -x
 /usr/sbin/dkms --rpm_safe_upgrade add -m vboxadditions -v %{version}-%{release} ||:
 /usr/sbin/dkms --rpm_safe_upgrade build -m vboxadditions -v %{version}-%{release} ||:
 /usr/sbin/dkms --rpm_safe_upgrade install -m vboxadditions -v %{version}-%{release} ||:
+/sbin/modprobe vboxsf >/dev/null 2>&1 || :
+/sbin/modprobe vboxguest >/dev/null 2>&1 || :
 :
 
 %preun -n dkms-vboxadd
 set -x
+/sbin/rmmod vboxguest >/dev/null 2>&1
+/sbin/rmmod vboxsf >/dev/null 2>&1
 /usr/sbin/dkms --rpm_safe_upgrade remove -m vboxadditions -v %{version}-%{release} --all ||:
 :
 
 %endif
 
+
 %files
 %defattr(-,root,root)
 %config %{_sysconfdir}/vbox/vbox.cfg
@@ -553,6 +586,8 @@ set -x
 # desktop integration
 %{_datadir}/icons/*.png
 %{_datadir}/applications/%{name}.desktop
+# User Manual
+%{_datadir}/%{name}/UserManual.pdf
 
 %files -n dkms-%{name}
 %defattr(-,root,root)
@@ -594,6 +629,24 @@ set -x
 
 
 %changelog
+* Wed Jan 03 2018 Toshiaki Ara <ara_t@384.jp> 5.2.4-1
+- update to 5.2.4
+- add BuildRequires: libXinerama-devel
+- add BuildRequires: libXrandr-devel
+- add BuildRequires: libpng-devel
+- add BuildRequires: qt5-qtbase-devel
+- add BuildRequires: qt5-qtx11extras-devel
+- add BuildRequires: qt5-linguist
+- delete --enable-qt4 option
+- add Source1 (UserManual.pdf)
+- drop Patch2 (VirtualBox-4.0.6-kernelrelease.patch)
+- drop Patch130 (VirtualBox-5.1.18-build-fix-with-qt4.patch)
+- add Vendor and Distribution tags
+
+* Mon Apr 10 2017 Daisuke SUZUKI <daisuke@vinelinux.org> 5.1.18-1
+- update to 5.1.18
+- add --enable-qt4 to build with Qt4
+
 * Sat Jul 23 2016 Yoji TOYODA <bsyamato@sea.plala.or.jp> 5.0.26-1
 - update to 5.0.26
 - update Patch6 (VirtualBox-5.0.26_OSE-initscriptname.patch)