X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=VirtualBox.spec;h=7ab6fc96926e3f6f363c5affc372a0cb916afd3a;hb=01e414bacfa9c0571f6bfd0254d88b29e766e2dc;hp=f02c7b0f641d346d4b22d28f9e46fb9df8432e21;hpb=563e8aad073dc3b047e61a6d8068e3c8339b416b;p=packages%2FVirtualBox.git diff --git a/VirtualBox.spec b/VirtualBox.spec index f02c7b0..7ab6fc9 100644 --- a/VirtualBox.spec +++ b/VirtualBox.spec @@ -6,6 +6,9 @@ # - 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) # # Conditional build: %bcond_without doc # don't build the documentation @@ -35,14 +38,14 @@ Summary: VirtualBox OSE - x86 hardware virtualizer Summary(pl.UTF-8): VirtualBox OSE - wirtualizator sprzętu x86 Name: %{pname}%{_alt_kernel} -Version: 4.0.2 +Version: 4.0.12 Release: %{rel} License: GPL v2 Group: Applications/Emulators Source0: http://download.virtualbox.org/virtualbox/%{version}/%{pname}-%{version}.tar.bz2 -# Source0-md5: 4957fa3826bb1273c4d748692d896c8b +# Source0-md5: 5b39b99c2a36c96a062913e8ac67c60f Source1: http://download.virtualbox.org/virtualbox/%{version}/VBoxGuestAdditions_%{version}.iso -# Source1-md5: b87a42646972054481bcc2541dc04a09 +# Source1-md5: 3573d8233bc2a343ff6a5c9cfa6764c2 Source3: %{pname}-vboxdrv.init Source4: %{pname}-vboxguest.init Source5: %{pname}-vboxnetflt.init @@ -58,6 +61,12 @@ Patch3: %{pname}-warning_workaround.patch Patch4: %{pname}-vnc.patch Patch5: %{pname}-dri.patch Patch6: %{pname}-vboxnetflt-no-qdisc.patch +# ubuntu patches +Patch7: 16-no-update.patch +Patch8: 18-system-xorg.patch +Patch9: 22-no-static-libstdcpp.patch +# /ubuntu patches +Patch10: %{pname}-disable_build_NetBiosBin.patch URL: http://www.virtualbox.org/ BuildRequires: rpmbuild(macros) >= 1.535 %if %{with userspace} @@ -70,8 +79,11 @@ BuildRequires: libstdc++-multilib-static %if "%{pld_release}" == "ac" BuildRequires: XFree86-devel %else +BuildRequires: xorg-lib-libXcomposite-devel BuildRequires: xorg-lib-libXcursor-devel BuildRequires: xorg-lib-libXmu-devel +BuildRequires: xorg-proto-glproto-devel +BuildRequires: xorg-xserver-server-devel %endif BuildRequires: OpenGL-GLU-devel BuildRequires: OpenGL-devel @@ -89,17 +101,19 @@ BuildRequires: curl-devel BuildRequires: gcc >= 5:3.2.3 BuildRequires: libIDL-devel BuildRequires: libcap-static +BuildRequires: libdrm-devel 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 +BuildRequires: libvncserver-devel >= 0.9.7 BuildRequires: libxml2-devel >= 2.6.26 BuildRequires: libxslt-devel >= 1.1.17 BuildRequires: libxslt-progs >= 1.1.17 -BuildRequires: mkisofs BuildRequires: makeself +BuildRequires: mkisofs BuildRequires: pam-devel +BuildRequires: pixman-devel BuildRequires: pkgconfig BuildRequires: pulseaudio-devel >= 0.9.0 BuildRequires: python-devel @@ -112,6 +126,8 @@ BuildRequires: texlive-fonts-bitstream BuildRequires: texlive-fonts-other BuildRequires: texlive-fonts-type1-bitstream BuildRequires: texlive-format-pdflatex +BuildRequires: texlive-latex-ucs +BuildRequires: texlive-xetex %endif BuildRequires: which BuildRequires: xalan-c-devel >= 1.10.0 @@ -185,6 +201,13 @@ wirtualnych są w całości przechowywane w XML-u i są niezależne od lokalnej maszyny. Dzięki temu można szybko i łatwo przenieść konfigurację maszyny wirtualnej na inny komputer. +%package doc +Summary: VirtualBox documentation +Group: Documentation + +%description doc +This package contains VirtualBox User Manual. + %package udev Summary: udev rules for VirtualBox OSE kernel modules Summary(pl.UTF-8): Reguły udev dla modułów jądra Linuksa dla VirtualBoksa @@ -214,10 +237,10 @@ You should install this package in your Host OS. %package guest Summary: VirtualBox Guest Additions Group: Base -Suggests: kernel%{_alt_kernel}-misc-vboxsf = %{version}-%{rel}@%{_kernel_ver_str} -Suggests: kernel%{_alt_kernel}-misc-vboxvideo = %{version}-%{rel}@%{_kernel_ver_str} Requires: xorg-driver-input-vboxmouse = %{version}-%{release} Requires: xorg-driver-video-vboxvideo = %{version}-%{release} +Suggests: kernel%{_alt_kernel}-misc-vboxsf = %{version}-%{rel}@%{_kernel_ver_str} +Suggests: kernel%{_alt_kernel}-misc-vboxvideo = %{version}-%{rel}@%{_kernel_ver_str} %description guest Tools that utilize kernel modules for supporting integration with the @@ -239,7 +262,7 @@ Summary: X.org mouse driver for VirtualBox OSE guest OS Summary(pl.UTF-8): Sterownik myszy dla systemu gościa w VirtualBoksie OSE Group: X11/Applications Requires: xorg-xserver-server >= 1.0.99.901 -Requires: xorg-xserver-server(xinput-abi) <= 11.0 +Requires: xorg-xserver-server(xinput-abi) <= 12.2 Requires: xorg-xserver-server(xinput-abi) >= 4.0 %description -n xorg-driver-input-vboxmouse @@ -255,7 +278,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) <= 8.0 +Requires: xorg-xserver-server(videodrv-abi) <= 10.0 Requires: xorg-xserver-server(videodrv-abi) >= 2.0 %description -n xorg-driver-video-vboxvideo @@ -427,6 +450,10 @@ tar -zxf guest-modules.tar.gz -C GuestDrivers tar -zxf host-modules.tar.gz -C HostDrivers cd - %patch6 -p1 +%patch7 -p1 +%patch8 -p1 +%patch9 -p1 +%patch10 -p1 %build %if %{with userspace} @@ -437,10 +464,16 @@ echo "VBOX_WITH_TESTCASES := " > LocalConfig.kmk %{!?with_doc:--disable-docs} \ --disable-java \ --disable-hardening \ - --disable-kmods + --disable-kmods \ + --enable-vnc +XSERVER_VERSION=$(rpm -q --queryformat '%{VERSION}\n' xorg-xserver-server-devel | awk -F. ' { print $1 $2 } ' 2> /dev/null || echo ERROR) . ./env.sh && \ -kmk -j1 %{?with_verbose:KBUILD_VERBOSE=3} USER=$(id -un) +kmk -j1 \ + %{?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" %endif %if %{with kernel} @@ -481,11 +514,11 @@ 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},%{_pixmapsdir}}/VBox.png +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}/additions/vboxmouse_drv_19.so,%{_libdir}/xorg/modules/input/vboxmouse_drv.so} -mv $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions/vboxvideo_drv_19.so,%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so} +mv $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions/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} # xorg other driver versions rm -vf $RPM_BUILD_ROOT%{_libdir}/%{pname}/additions/vboxmouse_drv*.{o,so} @@ -515,7 +548,14 @@ rm $RPM_BUILD_ROOT%{_libdir}/%{pname}/tst* rm $RPM_BUILD_ROOT%{_libdir}/%{pname}/scm # 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 +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 \ + $RPM_BUILD_ROOT/etc/xdg/autostart/vboxclient.desktop # unknown - checkme %if 1 @@ -523,8 +563,6 @@ 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}/additions/VBoxClient -rm $RPM_BUILD_ROOT%{_libdir}/%{pname}/additions/VBoxControl rm $RPM_BUILD_ROOT%{_libdir}/%{pname}/vboxshell.py rm $RPM_BUILD_ROOT%{_libdir}/%{pname}/xpidl %endif @@ -657,13 +695,10 @@ fi %if %{with userspace} %files %defattr(644,root,root,755) -%{?with_doc:%doc %{outdir}/UserManual.pdf} %dir %{_libdir}/VirtualBox %dir %{_libdir}/VirtualBox/ExtensionPacks %dir %{_libdir}/VirtualBox/additions %dir %{_libdir}/VirtualBox/components -%dir %{_libdir}/VirtualBox/icons -%dir %{_libdir}/VirtualBox/icons/*x* %dir %{_libdir}/VirtualBox/nls %attr(755,root,root) %{_bindir}/VBoxBFE %attr(755,root,root) %{_bindir}/VBoxHeadless @@ -763,12 +798,9 @@ fi %lang(uk) %{_libdir}/VirtualBox/nls/*_uk.qm %lang(zh_CN) %{_libdir}/VirtualBox/nls/*_zh_CN.qm %lang(zh_TW) %{_libdir}/VirtualBox/nls/*_zh_TW.qm -%{_pixmapsdir}/VBox.png +%{_pixmapsdir}/virtualbox.png %{_desktopdir}/*.desktop -%{_libdir}/VirtualBox/icons/*/virtualbox-ova.png -%{_libdir}/VirtualBox/icons/*/virtualbox-ovf.png -%{_libdir}/VirtualBox/icons/*/virtualbox-vbox-extpack.png -%{_libdir}/VirtualBox/icons/*/virtualbox-vbox.png +%{_libdir}/VirtualBox/icons %{_libdir}/VirtualBox/virtualbox.xml %files additions @@ -779,8 +811,12 @@ fi %defattr(644,root,root,755) # NOTE: unfinished, should contain .desktop files for starting up mouse # integration and other desktop services -# NOTE: the filelist is incopmplete too +# NOTE: the filelist is incomplete too +%attr(755,root,root) %{_bindir}/VBoxClient +%attr(755,root,root) %{_bindir}/VBoxControl %attr(755,root,root) %{_bindir}/VBoxService +/etc/X11/xinit/xinitrc.d/98vboxadd-xclient.sh +/etc/xdg/autostart/vboxclient.desktop %attr(755,root,root) %{_libdir}/VirtualBox/additions/autorun.sh %attr(755,root,root) %{_libdir}/VirtualBox/additions/vboxadd @@ -791,6 +827,12 @@ fi %defattr(644,root,root,755) %attr(755,root,root) /%{_lib}/security/pam_vbox.so +%if %{with doc} +%files doc +%defattr(644,root,root,755) +%doc %{outdir}/UserManual.pdf +%endif + %files udev %defattr(644,root,root,755) %config(noreplace) %verify(not md5 mtime size) /etc/udev/rules.d/virtualbox.rules