X-Git-Url: http://git.pld-linux.org/?p=packages%2FVirtualBox.git;a=blobdiff_plain;f=VirtualBox.spec;h=0d0bf6c98f361d2a79d698b7100df5d999ac061f;hp=66873262474d38bb07fcb31deb78a2b1e6250786;hb=e08dff858d9d46ec10c1a21126a2fbcf398567d9;hpb=e9aa839aba973728c41d747e8660e159250b6ca3

diff --git a/VirtualBox.spec b/VirtualBox.spec
index 6687326..0d0bf6c 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -1,21 +1,20 @@
 # TODO
 # - java bindings
 # - Package SDK.
-# - Package utils (and write initscripts ?) for Guest OS.
 # - Check License of VBoxGuestAdditions_*.iso, it's probably not GPL v2.
 #   If so check if it is distributable.
-# - resolve mess with subpackages?
-#   - addtions: iso (containing additions/*.iso)
-#   - guest: to be installed to guests (deps on x11 drivers)
+# - guest x11 additions: currently incomplete/untested
 # - enable VDE networking: --enable-vde
+# - initscripts for webservice
+# - install systemd vboxservice.service
 #
 # Conditional build:
 %bcond_without	doc		# don't build the documentation
 %bcond_without	dist_kernel	# without distribution kernel
 %bcond_without	kernel		# don't build kernel module
 %bcond_without	userspace	# don't build userspace package
-%bcond_with	webservice	# webservice (soap) support
-%bcond_without	lightdm	# lightdm greeter
+%bcond_with	webservice	# webservice (SOAP) support
+%bcond_without	lightdm		# lightdm greeter
 %bcond_without	verbose
 %bcond_with	force_userspace # force userspace build (useful if alt_kernel is set)
 
@@ -33,19 +32,19 @@
 %define		_enable_debug_packages	0
 %endif
 
-%define		rel		8
+%define		rel		6
 %define		pname		VirtualBox
 Summary:	VirtualBox - x86 hardware virtualizer
 Summary(pl.UTF-8):	VirtualBox - wirtualizator sprzętu x86
 Name:		%{pname}%{_alt_kernel}
-Version:	4.2.12
+Version:	4.2.16
 Release:	%{rel}
 License:	GPL v2
 Group:		Applications/Emulators
 Source0:	http://download.virtualbox.org/virtualbox/%{version}/%{pname}-%{version}.tar.bz2
-# Source0-md5:	654e45054ae6589452508d37403dc800
+# Source0-md5:	c4a36e2099a317f4715cd3861cdae238
 Source1:	http://download.virtualbox.org/virtualbox/%{version}/VBoxGuestAdditions_%{version}.iso
-# Source1-md5:	403098e688f9e7f4273de680f6734983
+# Source1-md5:	6074747feb9ae8b6eec365616347eef3
 Source2:	vboxservice.init
 Source3:	%{pname}-vboxdrv.init
 Source4:	%{pname}-vboxguest.init
@@ -68,7 +67,6 @@ Patch2:		%{pname}-warning_workaround.patch
 Patch3:		%{pname}-dri.patch
 Patch4:		%{pname}-disable_build_NetBiosBin.patch
 Patch5:		xserver-1.12.patch
-Patch6:		gcc48.patch
 Patch7:		lightdm-greeter-glib-includes.patch
 Patch8:		lightdm-greeter-g++-link.patch
 # ubuntu patches
@@ -121,7 +119,7 @@ BuildRequires:	libvncserver-devel >= 0.9.9
 BuildRequires:	libxml2-devel >= 2.6.26
 BuildRequires:	libxslt-devel >= 1.1.17
 BuildRequires:	libxslt-progs >= 1.1.17
-%{?with_lightdm:BuildRequires:	lightdm-devel}
+%{?with_lightdm:BuildRequires:	lightdm-libs-qt-devel}
 BuildRequires:	makeself
 BuildRequires:	mkisofs
 BuildRequires:	pam-devel
@@ -290,6 +288,15 @@ X.org X11 video and mouse drivers
 
 You should install this package in your Guest OS for X11 session.
 
+%package webservice
+Summary:	VirtualBox Web Service
+Group:		Applications/Emulators
+Requires:	%{name} = %{version}-%{release}
+
+%description webservice
+This package contains VirtualBox web service API daemon. It allows to
+control virtual machines via web interface.
+
 %package -n lightdm-greeter-vbox
 Summary:	VirtualBox greeter for lightdm
 Group:		Themes
@@ -533,7 +540,6 @@ Moduł jądra Linuksa dla VirtualBoksa - sterownik obsługi DRM.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-%patch6 -p1
 %patch7 -p1
 %patch8 -p1
 
@@ -560,9 +566,25 @@ cd -
 # using system kBuild package
 %{__rm} -r kBuild
 
+cat <<'EOF'>> LocalConfig.kmk
+%{?with_verbose:KBUILD_VERBOSE=3}
+USERNAME=%(id -un)
+__VBOX_BUILD_PUBLISHER=_PLD
+VBOX_VERSION_STRING=$(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD)_PLD
+XSERVER_VERSION=%(rpm -q --queryformat '%{V}\n' xorg-xserver-server-devel | awk -F. '{ print $1 $2 }' 2>/dev/null || echo ERROR)
+VBOX_USE_SYSTEM_XORG_HEADERS=1
+%if %{with lightdm}
+VBOX_WITH_LIGHTDM_GREETER=1
+VBOX_WITH_LIGHTDM_GREETER_PACKING=1
+%endif
+TOOL_GCC3_CFLAGS=%{rpmcflags}
+TOOL_GCC3_CXXFLAGS=%{rpmcxxflags}
+VBOX_GCC_OPT=%{rpmcxxflags}
+VBOX_WITH_TESTCASES=
+EOF
+
 %build
 %if %{with userspace}
-echo "VBOX_WITH_TESTCASES := " > LocalConfig.kmk
 ./configure \
 	--with-gcc="%{__cc}" \
 	--with-g++="%{__cxx}" \
@@ -575,20 +597,7 @@ echo "VBOX_WITH_TESTCASES := " > LocalConfig.kmk
 	%{nil}
 
 XSERVER_VERSION=$(rpm -q --queryformat '%{VERSION}\n' xorg-xserver-server-devel | awk -F. ' { print $1 $2 } ' 2> /dev/null || echo ERROR)
-kmk %{?_smp_mflags} \
-	%{?with_verbose:KBUILD_VERBOSE=3} \
-	USER=%(id -un) \
-	VBOX_VERSION_STRING='$(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD)'_PLD \
-	XSERVER_VERSION="$XSERVER_VERSION" \
-	VBOX_USE_SYSTEM_XORG_HEADERS=1 \
-%if %{with lightdm}
-	VBOX_WITH_LIGHTDM_GREETER=1 \
-	VBOX_WITH_LIGHTDM_GREETER_PACKING=1 \
-%endif
-	TOOL_GCC3_CFLAGS="%{rpmcflags}" \
-	TOOL_GCC3_CXXFLAGS="%{rpmcxxflags}" \
-	VBOX_GCC_OPT="%{rpmcxxflags}" \
-	%{nil}
+kmk %{?_smp_mflags}
 %endif
 
 %if %{with kernel}
@@ -789,7 +798,7 @@ fi
 /sbin/chkconfig --add vboxservice
 %service vboxservice restart
 
-%postun guest
+%preun guest
 if [ "$1" = "0" ]; then
 	/sbin/chkconfig --del vboxservice
 	%service vboxservice -q stop
@@ -1057,6 +1066,13 @@ fi
 %attr(755,root,root) %{_libdir}/%{pname}/additions/vboxadd-service
 %attr(755,root,root) %{_libdir}/%{pname}/additions/vboxadd-x11
 
+%if %{with webservice}
+%files webservice
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/%{pname}/vboxwebsrv
+%attr(755,root,root) %{_libdir}/%{pname}/webtest
+%endif
+
 %if %{with lightdm}
 %files -n lightdm-greeter-vbox
 %defattr(644,root,root,755)