- rebuild for kernel-3.10.13-1

[packages/VirtualBox.git] / VirtualBox.spec

diff --git a/VirtualBox.spec b/VirtualBox.spec
index dcb66c9398038b1f4e2023f4ca7fd189d402352a..0d0bf6c98f361d2a79d698b7100df5d999ac061f 100644 (file)
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -14,7 +14,7 @@
 %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_without lightdm         # lightdm greeter
 %bcond_without verbose
 %bcond_with    force_userspace # force userspace build (useful if alt_kernel is set)
 
@@ -32,19 +32,19 @@
 %define                _enable_debug_packages  0
 %endif
 
-%define                rel             9
+%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
@@ -67,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
@@ -120,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
@@ -541,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
 
@@ -568,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}" \
@@ -583,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}
@@ -797,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