X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=VirtualBox.spec;h=412c391cb2c5092e97be911786f6e7d6d7154b63;hb=39c29c7f530fa0f053279e6293a37c6562e80d62;hp=0a5c81a26f7c7432dd7989f5f1ebc291fdc7e3ee;hpb=becccbffb93c2dd5fc23a313b3e860db5246335e;p=packages%2FVirtualBox.git diff --git a/VirtualBox.spec b/VirtualBox.spec index 0a5c81a..412c391 100644 --- a/VirtualBox.spec +++ b/VirtualBox.spec @@ -32,19 +32,19 @@ %define _enable_debug_packages 0 %endif -%define rel 6 +%define rel 3 %define pname VirtualBox Summary: VirtualBox - x86 hardware virtualizer Summary(pl.UTF-8): VirtualBox - wirtualizator sprzętu x86 Name: %{pname}%{_alt_kernel} -Version: 4.1.14 +Version: 4.2.0 Release: %{rel} License: GPL v2 Group: Applications/Emulators Source0: http://download.virtualbox.org/virtualbox/%{version}/%{pname}-%{version}.tar.bz2 -# Source0-md5: f8baa04e6d589bc6b1fb4e7079fbe414 +# Source0-md5: 691b4134983ce7d89b9fb683305cb647 Source1: http://download.virtualbox.org/virtualbox/%{version}/VBoxGuestAdditions_%{version}.iso -# Source1-md5: aa43510d60bdb8b7bf6ae81e2f942ca9 +# Source1-md5: ee74e968bab97466c3b463a0b4d665f5 Source3: %{pname}-vboxdrv.init Source4: %{pname}-vboxguest.init Source5: %{pname}-vboxnetflt.init @@ -64,10 +64,9 @@ Patch0: %{pname}-configure-spaces.patch Patch1: %{pname}-export_modules.patch Patch2: %{pname}-VBoxSysInfo.patch Patch3: %{pname}-warning_workaround.patch -Patch4: %{pname}-vnc.patch -Patch5: %{pname}-dri.patch -Patch6: %{pname}-disable_build_NetBiosBin.patch -Patch7: xserver-1.12.patch +Patch4: %{pname}-dri.patch +Patch5: %{pname}-disable_build_NetBiosBin.patch +Patch6: xserver-1.12.patch # ubuntu patches Patch10: 16-no-update.patch Patch11: 18-system-xorg.patch @@ -111,7 +110,7 @@ BuildRequires: libpng-devel >= 1.2.5 BuildRequires: libstdc++-devel >= 5:3.2.3 BuildRequires: libstdc++-static >= 5:3.2.3 BuildRequires: libuuid-devel -BuildRequires: libvncserver-devel >= 0.9.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 @@ -148,6 +147,7 @@ Requires(postun): /usr/sbin/groupdel Requires(pre): /usr/bin/getgid Requires(pre): /usr/sbin/groupadd Requires: QtCore >= 4.7.0 +Requires: libvncserver >= 0.9.9 Suggests: gxmessage Provides: group(vbox) ExclusiveArch: %{ix86} %{x8664} @@ -293,7 +293,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) <= 12.0 +Requires: xorg-xserver-server(videodrv-abi) <= 12.1 Requires: xorg-xserver-server(videodrv-abi) >= 2.0 %description -n xorg-driver-video-vboxvideo @@ -489,7 +489,6 @@ Moduł jądra Linuksa dla VirtualBoksa - sterownik obsługi DRM. %patch4 -p1 %patch5 -p1 %patch6 -p1 -%patch7 -p1 %{__sed} -i -e 's,@VBOX_DOC_PATH@,%{_docdir}/%{name}-%{version},' \ -e 's/Categories=.*/Categories=Utility;Emulator;/' src/VBox/Installer/common/virtualbox.desktop.in @@ -562,6 +561,10 @@ fi cp -a$l %{outdir}/* $RPM_BUILD_ROOT%{_libdir}/%{pname} +%if %{with doc} +ln -sf %{_docdir}/%{pname}-doc-%{version}/UserManual.pdf $RPM_BUILD_ROOT%{_libdir}/%{pname}/UserManual.pdf +%endif + cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_libdir}/VirtualBox/additions/VBoxGuestAdditions.iso install -p %{SOURCE10} $RPM_BUILD_ROOT%{_sbindir}/mount.vdi install -p VirtualBox-wrapper.sh $RPM_BUILD_ROOT%{_libdir}/%{pname} @@ -598,9 +601,7 @@ 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* - -# IPRT Testcase / Tool - Source Code Massager. -rm $RPM_BUILD_ROOT%{_libdir}/%{pname}/scm +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} @@ -792,6 +793,8 @@ fi %defattr(644,root,root,755) %dir %{_libdir}/VirtualBox %dir %{_libdir}/VirtualBox/ExtensionPacks +%dir %{_libdir}/VirtualBox/ExtensionPacks/VNC +%dir %{_libdir}/VirtualBox/ExtensionPacks/VNC/linux* %dir %{_libdir}/VirtualBox/additions %dir %{_libdir}/VirtualBox/components %dir %{_libdir}/VirtualBox/nls @@ -807,6 +810,7 @@ fi %attr(755,root,root) %{_libdir}/VirtualBox/DBGCPlugInDiggers.so %attr(755,root,root) %{_libdir}/VirtualBox/VBoxAuth.so %attr(755,root,root) %{_libdir}/VirtualBox/VBoxAuthSimple.so +%attr(755,root,root) %{_libdir}/VirtualBox/VBoxAutostart %attr(755,root,root) %{_libdir}/VirtualBox/VBoxBFE %attr(755,root,root) %{_libdir}/VirtualBox/VBoxBalloonCtrl %attr(755,root,root) %{_libdir}/VirtualBox/VBoxCreateUSBNode.sh @@ -814,6 +818,7 @@ fi %attr(755,root,root) %{_libdir}/VirtualBox/VBoxDD2.so %attr(755,root,root) %{_libdir}/VirtualBox/VBoxDD.so %attr(755,root,root) %{_libdir}/VirtualBox/VBoxDDU.so +%attr(755,root,root) %{_libdir}/VirtualBox/VBoxDragAndDropSvc.so %attr(755,root,root) %{_libdir}/VirtualBox/VBoxExtPackHelperApp %attr(755,root,root) %{_libdir}/VirtualBox/VBoxGuestControlSvc.so %attr(755,root,root) %{_libdir}/VirtualBox/VBoxGuestPropSvc.so @@ -841,33 +846,34 @@ fi %attr(755,root,root) %{_libdir}/VirtualBox/VBoxTestOGL %attr(755,root,root) %{_libdir}/VirtualBox/VBoxTunctl %attr(755,root,root) %{_libdir}/VirtualBox/VBoxVMM.so +%attr(755,root,root) %{_libdir}/VirtualBox/VBoxVMMPreload %attr(755,root,root) %{_libdir}/VirtualBox/VBoxXPCOMC.so %attr(755,root,root) %{_libdir}/VirtualBox/VBoxXPCOMIPCD %attr(755,root,root) %{_libdir}/VirtualBox/VBoxXPCOM.so %attr(755,root,root) %{_libdir}/VirtualBox/VirtualBox %attr(755,root,root) %{_libdir}/VirtualBox/VirtualBox-wrapper.sh +%attr(755,root,root) %{_libdir}/VirtualBox/ExtensionPacks/VNC/linux*/VBoxVNC*.so %{_libdir}/VirtualBox/VBoxDD2GC.gc %{_libdir}/VirtualBox/VBoxDDGC.gc %{_libdir}/VirtualBox/VMMGC.gc %{_libdir}/VirtualBox/VBoxDD2R0.r0 %{_libdir}/VirtualBox/VBoxDDR0.r0 %{_libdir}/VirtualBox/VMMR0.r0 -%{_libdir}/VirtualBox/EfiThunk +#%{_libdir}/VirtualBox/EfiThunk %{_libdir}/VirtualBox/VBoxEFI32.fd %{_libdir}/VirtualBox/VBoxEFI64.fd %{_libdir}/VirtualBox/components/VBoxXPCOMBase.xpt +%{_libdir}/VirtualBox/ExtensionPacks/VNC/ExtPack.xml %{_libdir}/VirtualBox/components/VirtualBox_XPCOM.xpt %attr(755,root,root) %{_libdir}/VirtualBox/components/VBoxC.so %attr(755,root,root) %{_libdir}/VirtualBox/components/VBoxSVCM.so %attr(755,root,root) %{_libdir}/VirtualBox/components/VBoxXPCOMIPCC.so -%lang(ar) %{_libdir}/VirtualBox/nls/*_ar.qm %lang(bg) %{_libdir}/VirtualBox/nls/*_bg.qm %lang(ca) %{_libdir}/VirtualBox/nls/*_ca.qm %lang(ca_VA) %{_libdir}/VirtualBox/nls/*_ca_VA.qm %lang(cs) %{_libdir}/VirtualBox/nls/*_cs.qm %lang(da) %{_libdir}/VirtualBox/nls/*_da.qm %lang(de) %{_libdir}/VirtualBox/nls/*_de.qm -%lang(el) %{_libdir}/VirtualBox/nls/*_el.qm %lang(en) %{_libdir}/VirtualBox/nls/*_en.qm %lang(es) %{_libdir}/VirtualBox/nls/*_es.qm %lang(eu) %{_libdir}/VirtualBox/nls/*_eu.qm @@ -919,6 +925,7 @@ fi %attr(755,root,root) %{_libdir}/VirtualBox/additions/vboxadd-service %attr(755,root,root) %{_libdir}/VirtualBox/additions/vboxadd-x11 %attr(755,root,root) %{_libdir}/VirtualBox/additions/vboxvideo_drv_111.so +#attr(755,root,root) %{_libdir}/VirtualBox/additions/vboxvideo_drv_113.so %files -n pam-pam_vbox %defattr(644,root,root,755) @@ -927,6 +934,9 @@ fi %if %{with doc} %files doc %defattr(644,root,root,755) +# this is a symlink... +%doc %{_libdir}/%{pname}/UserManual.pdf +# ..to this file %doc %{outdir}/UserManual.pdf %endif