- really use system xorg headers

[packages/VirtualBox.git] / VirtualBox.spec

diff --git a/VirtualBox.spec b/VirtualBox.spec
index c0073992059e152d4198275174c06e30f5dd60b8..280deb626a43755ea698abbd169917f5a87fe5d6 100644 (file)
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -32,19 +32,19 @@
 %define                _enable_debug_packages  0
 %endif
 
-%define                rel             7
+%define                rel             1
 %define                pname           VirtualBox
 Summary:       VirtualBox - x86 hardware virtualizer
 Summary(pl.UTF-8):     VirtualBox - wirtualizator sprzętu x86
 Name:          %{pname}%{_alt_kernel}
-Version:       4.2.4
+Version:       4.2.10
 Release:       %{rel}
 License:       GPL v2
 Group:         Applications/Emulators
 Source0:       http://download.virtualbox.org/virtualbox/%{version}/%{pname}-%{version}.tar.bz2
-# Source0-md5: d1ec2d2a3f2f3f0b277dfe2c520c2e33
+# Source0-md5: 99349df34caacdecbb7cf3908631c3f3
 Source1:       http://download.virtualbox.org/virtualbox/%{version}/VBoxGuestAdditions_%{version}.iso
-# Source1-md5: 46fc9cf002e384fb199029c681efd7e8
+# Source1-md5: e49046cd56398f9f9b8410154f1a0393
 Source3:       %{pname}-vboxdrv.init
 Source4:       %{pname}-vboxguest.init
 Source5:       %{pname}-vboxnetflt.init
@@ -99,6 +99,7 @@ BuildRequires:        bash
 BuildRequires: bcc
 BuildRequires: bin86
 BuildRequires: curl-devel
+BuildRequires: device-mapper-devel
 %{?with_doc:BuildRequires:     docbook-dtd44-xml}
 BuildRequires: gcc >= 5:3.2.3
 %{?with_webservice:BuildRequires:      gsoap-devel}
@@ -137,6 +138,7 @@ BuildRequires:      texlive-xetex
 BuildRequires: which
 BuildRequires: xalan-c-devel >= 1.10.0
 BuildRequires: xerces-c-devel >= 2.6.0
+BuildRequires: yasm
 BuildRequires: zlib-devel >= 1.2.1
 %endif
 %if %{with dist_kernel}
@@ -295,7 +297,7 @@ Group:              X11/Applications
 Requires:      Mesa-dri-driver-swrast
 Requires:      xorg-xserver-libdri >= 1.7.4
 Requires:      xorg-xserver-server >= 1.0.99.901
-Requires:      xorg-xserver-server(videodrv-abi) <= 13.0
+Requires:      xorg-xserver-server(videodrv-abi) <= 13.1
 Requires:      xorg-xserver-server(videodrv-abi) >= 2.0
 
 %description -n xorg-driver-video-vboxvideo
@@ -554,6 +556,7 @@ kmk %{?_smp_mflags} \
        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 \
        TOOL_GCC3_CFLAGS="%{rpmcflags}" \
        TOOL_GCC3_CXXFLAGS="%{rpmcxxflags}" \
        VBOX_GCC_OPT="%{rpmcxxflags}" \
@@ -599,7 +602,7 @@ ln -sf %{_docdir}/%{pname}-doc-%{version}/UserManual_fr_FR.pdf $RPM_BUILD_ROOT%{
 %endif
 
 install -d $RPM_BUILD_ROOT%{_libdir}/%{pname}/additions
-cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_libdir}/%{pname}/additions/VBoxGuestAdditions.iso
+cp -a$l %{SOURCE1} $RPM_BUILD_ROOT%{_libdir}/%{pname}/additions/VBoxGuestAdditions.iso
 install -p %{SOURCE10} $RPM_BUILD_ROOT%{_sbindir}/mount.vdi
 install -p VirtualBox-wrapper.sh $RPM_BUILD_ROOT%{_libdir}/%{pname}
 for f in {VBox{BFE,Headless,Manage,SDL,SVC,Tunctl,XPCOMIPCD},VirtualBox}; do
@@ -610,7 +613,7 @@ mv $RPM_BUILD_ROOT{%{_libdir}/%{pname}/VBox.png,%{_pixmapsdir}/virtualbox.png}
 mv $RPM_BUILD_ROOT{%{_libdir}/%{pname},%{_desktopdir}}/virtualbox.desktop
 
 mv $RPM_BUILD_ROOT{%{_libdir}/%{pname}/vboxmouse_drv.so,%{_libdir}/xorg/modules/input/vboxmouse_drv.so}
-mv $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions/vboxvideo_drv.so,%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so}
+mv $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions/vboxvideo_drv_system.so,%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so}
 mv $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions/VBoxOGL.so,%{_libdir}/xorg/modules/dri/vboxvideo_dri.so}
 # xorg other driver versions
 rm -vf $RPM_BUILD_ROOT%{_libdir}/%{pname}/vboxmouse_drv*.{o,so}
@@ -665,6 +668,11 @@ rm $RPM_BUILD_ROOT%{_libdir}/%{pname}/dtrace/lib/%{vbox_arch}/vbox-types.d
 rm $RPM_BUILD_ROOT%{_libdir}/%{pname}/dtrace/lib/%{vbox_arch}/vm.d
 rm $RPM_BUILD_ROOT%{_libdir}/%{pname}/dtrace/lib/%{vbox_arch}/x86.d
 rm $RPM_BUILD_ROOT%{_libdir}/%{pname}/dtrace/testcase/%{vbox_arch}/vbox-vm-struct-test.d
+rm $RPM_BUILD_ROOT%{_libdir}/%{pname}/helpers/generate_service_file
+rm $RPM_BUILD_ROOT%{_libdir}/%{pname}/scripts/VBoxHeadlessXOrg.sh
+rm $RPM_BUILD_ROOT%{_libdir}/%{pname}/scripts/generated.sh
+rm $RPM_BUILD_ROOT%{_libdir}/%{pname}/scripts/init_template.sh
+rm $RPM_BUILD_ROOT%{_libdir}/%{pname}/scripts/install_service
 %endif
 
 # packaged by kernel part