X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=VirtualBox.spec;h=466b5722270a29b7b38c609a41ccd4fda5c9589f;hb=ffd7f18a392655400a58d7f9024a48e5e11cb3d8;hp=398be452d0bd7fa46c5aa5f38d22b97470489da0;hpb=60b1f18fa47daaa0a968af23012a442bbb1893a7;p=packages%2FVirtualBox.git diff --git a/VirtualBox.spec b/VirtualBox.spec index 398be45..466b572 100644 --- a/VirtualBox.spec +++ b/VirtualBox.spec @@ -32,19 +32,19 @@ %define _enable_debug_packages 0 %endif -%define rel 10 +%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} @@ -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}" \ @@ -588,7 +591,7 @@ install -d $RPM_BUILD_ROOT{%{_bindir},%{_sbindir},%{_libdir}/%{pname}/ExtensionP # test if we can hardlink -- %{_builddir} and $RPM_BUILD_ROOT on same partition if cp -al VBox.png $RPM_BUILD_ROOT/Vbox.png 2>/dev/null; then l=l - rm -f $RPM_BUILD_ROOT/VBox.png + %{__rm} -f $RPM_BUILD_ROOT/VBox.png fi cp -a$l %{outdir}/* $RPM_BUILD_ROOT%{_libdir}/%{pname} @@ -599,49 +602,49 @@ 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 ln -s %{_libdir}/%{pname}/VirtualBox-wrapper.sh $RPM_BUILD_ROOT%{_bindir}/$f done -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}/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/VBoxOGL.so,%{_libdir}/xorg/modules/dri/vboxvideo_dri.so} +%{__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_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} -rm -vf $RPM_BUILD_ROOT%{_libdir}/%{pname}/vboxvideo_drv*.{o,so} +%{__rm} -vf $RPM_BUILD_ROOT%{_libdir}/%{pname}/vboxmouse_drv*.{o,so} +%{__rm} -vf $RPM_BUILD_ROOT%{_libdir}/%{pname}/vboxvideo_drv*.{o,so} # XXX: where else to install them that vboxvideo_dri.so finds them? patch with rpath? -mv $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions,%{_libdir}}/VBoxOGLarrayspu.so -mv $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions,%{_libdir}}/VBoxOGLcrutil.so -mv $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions,%{_libdir}}/VBoxOGLerrorspu.so -mv $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions,%{_libdir}}/VBoxOGLfeedbackspu.so -mv $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions,%{_libdir}}/VBoxOGLpackspu.so -mv $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions,%{_libdir}}/VBoxOGLpassthroughspu.so +%{__mv} $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions,%{_libdir}}/VBoxOGLarrayspu.so +%{__mv} $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions,%{_libdir}}/VBoxOGLcrutil.so +%{__mv} $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions,%{_libdir}}/VBoxOGLerrorspu.so +%{__mv} $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions,%{_libdir}}/VBoxOGLfeedbackspu.so +%{__mv} $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions,%{_libdir}}/VBoxOGLpackspu.so +%{__mv} $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions,%{_libdir}}/VBoxOGLpassthroughspu.so install -d $RPM_BUILD_ROOT/etc/udev/rules.d cp -a %{SOURCE11} $RPM_BUILD_ROOT/etc/udev/rules.d/virtualbox.rules install -d $RPM_BUILD_ROOT/%{_lib}/security -mv $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions,/%{_lib}/security}/pam_vbox.so +%{__mv} $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions,/%{_lib}/security}/pam_vbox.so # cleanup unpackaged -rm -r $RPM_BUILD_ROOT%{_libdir}/%{pname}/{src,sdk,testcase} -rm -r $RPM_BUILD_ROOT%{_libdir}/%{pname}/additions/src -rm $RPM_BUILD_ROOT%{_libdir}/%{pname}/vboxkeyboard.tar.bz2 -rm $RPM_BUILD_ROOT%{_libdir}/%{pname}/tst* -rm $RPM_BUILD_ROOT%{_libdir}/%{pname}/ExtensionPacks/VNC/ExtPack-license.* +%{__rm} -r $RPM_BUILD_ROOT%{_libdir}/%{pname}/{src,sdk,testcase} +%{__rm} -r $RPM_BUILD_ROOT%{_libdir}/%{pname}/additions/src +%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/vboxkeyboard.tar.bz2 +%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/tst* +%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/ExtensionPacks/VNC/ExtPack-license.* # Guest Only Tools install -d $RPM_BUILD_ROOT/etc/{X11/xinit/xinitrc.d,xdg/autostart} -mv $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions,%{_bindir}}/VBoxService -mv $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions,%{_bindir}}/VBoxClient -mv $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions,%{_bindir}}/VBoxControl +%{__mv} $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions,%{_bindir}}/VBoxService +%{__mv} $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions,%{_bindir}}/VBoxClient +%{__mv} $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions,%{_bindir}}/VBoxControl install -p -D src/VBox/Additions/x11/Installer/98vboxadd-xclient \ $RPM_BUILD_ROOT/etc/X11/xinit/xinitrc.d/98vboxadd-xclient.sh cp -p src/VBox/Additions/x11/Installer/vboxclient.desktop \ @@ -649,26 +652,31 @@ cp -p src/VBox/Additions/x11/Installer/vboxclient.desktop \ # unknown - checkme %if 1 -rm $RPM_BUILD_ROOT%{_libdir}/%{pname}/SUPInstall -rm $RPM_BUILD_ROOT%{_libdir}/%{pname}/SUPLoggerCtl -rm $RPM_BUILD_ROOT%{_libdir}/%{pname}/SUPUninstall -rm $RPM_BUILD_ROOT%{_libdir}/%{pname}/VBox.sh -rm $RPM_BUILD_ROOT%{_libdir}/%{pname}/vboxshell.py -rm $RPM_BUILD_ROOT%{_libdir}/%{pname}/xpidl -rm $RPM_BUILD_ROOT%{_libdir}/%{pname}/additions/runasroot.sh -rm $RPM_BUILD_ROOT%{_libdir}/%{pname}/load.sh -rm $RPM_BUILD_ROOT%{_libdir}/%{pname}/loadall.sh -rm $RPM_BUILD_ROOT%{_libdir}/%{pname}/dtrace/lib/%{vbox_arch}/CPUMInternal.d -rm $RPM_BUILD_ROOT%{_libdir}/%{pname}/dtrace/lib/%{vbox_arch}/cpumctx.d -rm $RPM_BUILD_ROOT%{_libdir}/%{pname}/dtrace/lib/%{vbox_arch}/vbox-arch-types.d -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}/SUPInstall +%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/SUPLoggerCtl +%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/SUPUninstall +%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/VBox.sh +%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/vboxshell.py +%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/xpidl +%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/additions/runasroot.sh +%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/load.sh +%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/loadall.sh +%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/dtrace/lib/%{vbox_arch}/CPUMInternal.d +%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/dtrace/lib/%{vbox_arch}/cpumctx.d +%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/dtrace/lib/%{vbox_arch}/vbox-arch-types.d +%{__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 -rm $RPM_BUILD_ROOT%{_libdir}/%{pname}/additions/mount.vboxsf +%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/additions/mount.vboxsf %endif %if %{with kernel}