X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=VirtualBox.spec;h=ac6f23a90a7e12bcf1d3612cfe6971fc3a8fe6d6;hb=19e08c6a45b6c1b86db0d06fdc22099b0b968ddf;hp=51784a64f72974e9c9b829f674d31c335f47c846;hpb=bfca94416f243118852fa83bcdc8ba31f321eb5a;p=packages%2FVirtualBox.git diff --git a/VirtualBox.spec b/VirtualBox.spec index 51784a6..ac6f23a 100644 --- a/VirtualBox.spec +++ b/VirtualBox.spec @@ -1,7 +1,5 @@ -# # TODO # - java bindings -# - Find how to compile with PLD CFLAGS/CXXFLAGS/LDFLAGS. # - Package SDK. # - Package utils (and write initscripts ?) for Guest OS. # - Check License of VBoxGuestAdditions_*.iso, it's probably not GPL v2. @@ -9,14 +7,16 @@ # - resolve mess with subpackages? # - addtions: iso (containing additions/*.iso) # - guest: to be installed to guests (deps on x11 drivers) +# - enable VDE networking: --enable-vde # # Conditional build: %bcond_without doc # don't build the documentation %bcond_without dist_kernel # without distribution kernel %bcond_without kernel # don't build kernel module %bcond_without userspace # don't build userspace package +%bcond_with webservice # webservice (soap) support +%bcond_without verbose %bcond_with force_userspace # force userspace build (useful if alt_kernel is set) -%bcond_with verbose %if %{without kernel} %undefine with_dist_kernel @@ -32,19 +32,19 @@ %define _enable_debug_packages 0 %endif -%define rel 12 +%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.1.8 +Version: 4.2.4 Release: %{rel} License: GPL v2 Group: Applications/Emulators Source0: http://download.virtualbox.org/virtualbox/%{version}/%{pname}-%{version}.tar.bz2 -# Source0-md5: 2092bba46baa62fab5520d67dee2ece8 +# Source0-md5: d1ec2d2a3f2f3f0b277dfe2c520c2e33 Source1: http://download.virtualbox.org/virtualbox/%{version}/VBoxGuestAdditions_%{version}.iso -# Source1-md5: 2eb3daf08b717c76ecf1aa56b82eab03 +# Source1-md5: 46fc9cf002e384fb199029c681efd7e8 Source3: %{pname}-vboxdrv.init Source4: %{pname}-vboxguest.init Source5: %{pname}-vboxnetflt.init @@ -54,19 +54,23 @@ Source8: %{pname}-vboxpci.init Source9: %{pname}.sh Source10: mount.vdi Source11: udev.rules +Source12: %{pname}-vboxdrv-modules-load.conf +Source13: %{pname}-vboxguest-modules-load.conf +Source14: %{pname}-vboxnetflt-modules-load.conf +Source15: %{pname}-vboxsf-modules-load.conf +Source16: %{pname}-vboxnetadp-modules-load.conf +Source17: %{pname}-vboxpci-modules-load.conf 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 +Patch1: %{pname}-VBoxSysInfo.patch +Patch2: %{pname}-warning_workaround.patch +Patch3: %{pname}-dri.patch +Patch4: %{pname}-disable_build_NetBiosBin.patch +Patch5: xserver-1.12.patch # ubuntu patches -Patch10: 16-no-update.patch -Patch11: 18-system-xorg.patch +Patch10: 16-no-update.patch +Patch11: 18-system-xorg.patch # /ubuntu patches URL: http://www.virtualbox.org/ -BuildRequires: rpmbuild(macros) >= 1.535 %if %{with userspace} %ifarch %{x8664} BuildRequires: gcc-multilib @@ -97,6 +101,8 @@ BuildRequires: bin86 BuildRequires: curl-devel %{?with_doc:BuildRequires: docbook-dtd44-xml} BuildRequires: gcc >= 5:3.2.3 +%{?with_webservice:BuildRequires: gsoap-devel} +BuildRequires: kBuild >= 0.1.9998-2 BuildRequires: libIDL-devel BuildRequires: libcap-static BuildRequires: libdrm-devel @@ -104,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 @@ -118,6 +124,7 @@ BuildRequires: python-devel BuildRequires: python-modules BuildRequires: qt4-build >= 4.2.0 BuildRequires: qt4-linguist +BuildRequires: rpmbuild(macros) >= 1.627 BuildRequires: sed >= 4.0 %if %{with doc} BuildRequires: texlive-fonts-bitstream @@ -140,16 +147,19 @@ Requires(postun): /usr/sbin/groupdel Requires(pre): /usr/bin/getgid Requires(pre): /usr/sbin/groupadd Requires: QtCore >= 4.7.0 +Requires: desktop-file-utils +Requires: libvncserver >= 0.9.9 Suggests: gxmessage Provides: group(vbox) ExclusiveArch: %{ix86} %{x8664} BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %ifarch %{x8664} -%define vbox_platform linux.amd64 +%define vbox_arch amd64 %else -%define vbox_platform linux.x86 +%define vbox_arch x86 %endif +%define vbox_platform linux.%{vbox_arch} %define outdir out/%{vbox_platform}/release/bin %define _sbindir /sbin @@ -269,7 +279,7 @@ Summary: X.org mouse driver for VirtualBox guest OS Summary(pl.UTF-8): Sterownik myszy dla systemu gościa w VirtualBoksie Group: X11/Applications Requires: xorg-xserver-server >= 1.0.99.901 -Requires: xorg-xserver-server(xinput-abi) <= 13.0 +Requires: xorg-xserver-server(xinput-abi) <= 18.0 Requires: xorg-xserver-server(xinput-abi) >= 4.0 %description -n xorg-driver-input-vboxmouse @@ -285,7 +295,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) <= 11.0 +Requires: xorg-xserver-server(videodrv-abi) <= 13.0 Requires: xorg-xserver-server(videodrv-abi) >= 2.0 %description -n xorg-driver-video-vboxvideo @@ -294,19 +304,38 @@ X.org video driver for VirtualBox guest OS. %description -n xorg-driver-video-vboxvideo -l pl.UTF-8 Sterownik grafiki dla systemu gościa w VirtualBoksie. +%package kernel-init-host +Summary: SysV initscripts for host kernel modules +Group: Base/Kernel + +%description kernel-init-host +SysV initscripts for host kernel modules. + +%package kernel-init-guest +Summary: SysV initscripts for guest kernel modules +Group: Base/Kernel + +%description kernel-init-guest +SysV initscripts for guest kernel modules. + # KERNEL PACKAGES + # KEEP ALL REGULAR SUBPACKAGES BEFORE KERNEL PACKAGES. + %package -n kernel%{_alt_kernel}-misc-vboxguest Summary: VirtualBox Guest Additions for Linux Module Summary(pl.UTF-8): Moduł jądra Linuksa dla VirtualBoksa Release: %{rel}@%{_kernel_ver_str} Group: Base/Kernel Requires(post,postun): /sbin/depmod +Requires(post): systemd-units >= 38 Requires: dev >= 2.9.0-7 %if %{with dist_kernel} %requires_releq_kernel Requires(postun): %releq_kernel %endif +Requires: systemd-units >= 38 +Suggests: %{name}-kernel-init-guest >= %{version}-%{rel} Provides: kernel(vboxguest) = %{version}-%{rel} Obsoletes: kernel%{_alt_kernel}-misc-vboxadd Conflicts: kernel%{_alt_kernel}-misc-vboxdrv @@ -326,11 +355,14 @@ Summary(pl.UTF-8): Moduł jądra Linuksa dla VirtualBoksa Release: %{rel}@%{_kernel_ver_str} Group: Base/Kernel Requires(post,postun): /sbin/depmod +Requires(post): systemd-units >= 38 Requires: dev >= 2.9.0-7 %if %{with dist_kernel} %requires_releq_kernel Requires(postun): %releq_kernel %endif +Requires: systemd-units >= 38 +Suggests: %{name}-kernel-init-host >= %{version}-%{rel} Provides: kernel(vboxdrv) = %{version}-%{rel} %description -n kernel%{_alt_kernel}-misc-vboxdrv @@ -348,12 +380,15 @@ Summary(pl.UTF-8): Moduł jądra Linuksa dla VirtualBoksa Release: %{rel}@%{_kernel_ver_str} Group: Base/Kernel Requires(post,postun): /sbin/depmod +Requires(post): systemd-units >= 38 Requires: dev >= 2.9.0-7 Requires: kernel%{_alt_kernel}-misc-vboxdrv %if %{with dist_kernel} %requires_releq_kernel Requires(postun): %releq_kernel %endif +Requires: systemd-units >= 38 +Suggests: %{name}-kernel-init-host >= %{version}-%{rel} Provides: kernel(vboxnetflt) = %{version}-%{rel} %description -n kernel%{_alt_kernel}-misc-vboxnetadp @@ -371,12 +406,15 @@ Summary(pl.UTF-8): Moduł jądra Linuksa dla VirtualBoksa Release: %{rel}@%{_kernel_ver_str} Group: Base/Kernel Requires(post,postun): /sbin/depmod +Requires(post): systemd-units >= 38 Requires: dev >= 2.9.0-7 Requires: kernel%{_alt_kernel}-misc-vboxdrv %if %{with dist_kernel} %requires_releq_kernel Requires(postun): %releq_kernel %endif +Requires: systemd-units >= 38 +Suggests: %{name}-kernel-init-host >= %{version}-%{rel} Provides: kernel(vboxnetflt) = %{version}-%{rel} %description -n kernel%{_alt_kernel}-misc-vboxnetflt @@ -394,12 +432,15 @@ Summary(pl.UTF-8): Moduł jądra Linuksa dla VirtualBoksa Release: %{rel}@%{_kernel_ver_str} Group: Base/Kernel Requires(post,postun): /sbin/depmod +Requires(post): systemd-units >= 38 Requires: dev >= 2.9.0-7 Requires: kernel%{_alt_kernel}-misc-vboxdrv %if %{with dist_kernel} %requires_releq_kernel Requires(postun): %releq_kernel %endif +Requires: systemd-units >= 38 +Suggests: %{name}-kernel-init-host >= %{version}-%{rel} Provides: kernel(vboxpci) = %{version}-%{rel} %description -n kernel%{_alt_kernel}-misc-vboxpci @@ -418,12 +459,15 @@ Summary(pl.UTF-8): Moduł jądra Linuksa dla VirtualBoksa Release: %{rel}@%{_kernel_ver_str} Group: Base/Kernel Requires(post,postun): /sbin/depmod +Requires(post): systemd-units >= 38 Requires: dev >= 2.9.0-7 Requires: kernel%{_alt_kernel}-misc-vboxguest %if %{with dist_kernel} %requires_releq_kernel Requires(postun): %releq_kernel %endif +Requires: systemd-units >= 38 +Suggests: %{name}-kernel-init-guest >= %{version}-%{rel} Provides: kernel(vboxsf) = %{version}-%{rel} Obsoletes: kernel%{_alt_kernel}-misc-vboxvfs @@ -445,9 +489,7 @@ Requires(post,postun): /sbin/depmod Requires: dev >= 2.9.0-7 %if %{with dist_kernel} %requires_releq_kernel -%if "%{rpm_build_macros}" >= "1.531" %requires_releq_kernel -n drm -%endif Requires(postun): %releq_kernel %endif Provides: kernel(vboxvideo) = %{version}-%{rel} @@ -461,19 +503,22 @@ You should install this package in your Guest OS. Moduł jądra Linuksa dla VirtualBoksa - sterownik obsługi DRM. %prep -%setup -q -n %{pname}-%{version}_OSE +%setup -q -n %{pname}-%{version} %patch0 -p1 %patch1 -p1 %patch2 -p1 %patch3 -p1 %patch4 -p1 %patch5 -p1 -%patch6 -p1 %{__sed} -i -e 's,@VBOX_DOC_PATH@,%{_docdir}/%{name}-%{version},' \ -e 's/Categories=.*/Categories=Utility;Emulator;/' src/VBox/Installer/common/virtualbox.desktop.in -sed 's#@LIBDIR@#%{_libdir}#' < %{SOURCE9} > VirtualBox-wrapper.sh +# Respect LDFLAGS +%{__sed} -i -e "s@_LDFLAGS\.%{vbox_arch}*.*=@& %{rpmldflags}@g" \ + -i Config.kmk src/libs/xpcom18a4/Config.kmk + +%{__sed} 's#@LIBDIR@#%{_libdir}#' < %{SOURCE9} > VirtualBox-wrapper.sh install -d PLD-MODULE-BUILD/{GuestDrivers,HostDrivers} cd PLD-MODULE-BUILD @@ -486,6 +531,8 @@ cd - %patch10 -p1 %patch11 -p1 +# using system kBuild package +%{__rm} -r kBuild %build %if %{with userspace} @@ -497,18 +544,24 @@ echo "VBOX_WITH_TESTCASES := " > LocalConfig.kmk --disable-java \ --disable-hardening \ --disable-kmods \ - --enable-vnc + --enable-vnc \ + %{__enable webservice} \ + %{nil} 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 \ +kmk %{?_smp_mflags} \ %{?with_verbose:KBUILD_VERBOSE=3} \ - USER=$(id -un) \ + USER=%(id -un) \ VBOX_VERSION_STRING='$(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD)'_PLD \ - XSERVER_VERSION="$XSERVER_VERSION" + XSERVER_VERSION="$XSERVER_VERSION" \ + TOOL_GCC3_CFLAGS="%{rpmcflags}" \ + TOOL_GCC3_CXXFLAGS="%{rpmcxxflags}" \ + VBOX_GCC_OPT="%{rpmcxxflags}" \ + %{nil} %endif %if %{with kernel} +export KERN_DIR=%{_kernelsrcdir} cd PLD-MODULE-BUILD/HostDrivers %build_kernel_modules -m vboxdrv -C vboxdrv %build_kernel_modules -m vboxnetadp -C vboxnetadp @@ -519,7 +572,7 @@ cd ../GuestDrivers %build_kernel_modules -m vboxguest -C vboxguest cp -a vboxguest/Module.symvers vboxsf %build_kernel_modules -m vboxsf -C vboxsf -c -%build_kernel_modules -m vboxvideo -C vboxvideo_drm +%build_kernel_modules -m vboxvideo -C vboxvideo cd ../.. %{__cc} %{rpmcflags} %{rpmldflags} -Wall -Werror src/VBox/Additions/linux/sharedfolders/{mount.vboxsf.c,vbsfmount.c} -o mount.vboxsf %endif @@ -540,7 +593,13 @@ fi cp -a$l %{outdir}/* $RPM_BUILD_ROOT%{_libdir}/%{pname} -cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_libdir}/VirtualBox/additions/VBoxGuestAdditions.iso +%if %{with doc} +ln -sf %{_docdir}/%{pname}-doc-%{version}/UserManual.pdf $RPM_BUILD_ROOT%{_libdir}/%{pname}/UserManual.pdf +ln -sf %{_docdir}/%{pname}-doc-%{version}/UserManual_fr_FR.pdf $RPM_BUILD_ROOT%{_libdir}/%{pname}/UserManual_fr_FR.pdf +%endif + +install -d $RPM_BUILD_ROOT%{_libdir}/%{pname}/additions +cp -a %{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 @@ -569,16 +628,14 @@ 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}/VirtualBox/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* - -# 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} @@ -598,6 +655,16 @@ 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 %endif # packaged by kernel part @@ -605,7 +672,7 @@ rm $RPM_BUILD_ROOT%{_libdir}/%{pname}/additions/mount.vboxsf %endif %if %{with kernel} -install -d $RPM_BUILD_ROOT{/etc/{rc.d/init.d,modprobe.d},%{_sbindir}} +install -d $RPM_BUILD_ROOT{/etc/{rc.d/init.d,modules-load.d},%{_sbindir},%{systemdunitdir}} install -p %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/vboxdrv install -p %{SOURCE4} $RPM_BUILD_ROOT/etc/rc.d/init.d/vboxguest install -p %{SOURCE5} $RPM_BUILD_ROOT/etc/rc.d/init.d/vboxnetflt @@ -618,10 +685,25 @@ install -p %{SOURCE8} $RPM_BUILD_ROOT/etc/rc.d/init.d/vboxpci %install_kernel_modules -m PLD-MODULE-BUILD/HostDrivers/vboxpci/vboxpci -d misc %install_kernel_modules -m PLD-MODULE-BUILD/GuestDrivers/vboxguest/vboxguest -d misc %install_kernel_modules -m PLD-MODULE-BUILD/GuestDrivers/vboxsf/vboxsf -d misc -%install_kernel_modules -m PLD-MODULE-BUILD/GuestDrivers/vboxvideo_drm/vboxvideo -d misc +%install_kernel_modules -m PLD-MODULE-BUILD/GuestDrivers/vboxvideo/vboxvideo -d misc install -p mount.vboxsf $RPM_BUILD_ROOT%{_sbindir}/mount.vboxsf +# Tell systemd to load modules +cp -p %{SOURCE12} $RPM_BUILD_ROOT/etc/modules-load.d/vboxdrv.conf +cp -p %{SOURCE13} $RPM_BUILD_ROOT/etc/modules-load.d/vboxguest.conf +cp -p %{SOURCE14} $RPM_BUILD_ROOT/etc/modules-load.d/vboxnetflt.conf +cp -p %{SOURCE15} $RPM_BUILD_ROOT/etc/modules-load.d/vboxsf.conf +cp -p %{SOURCE16} $RPM_BUILD_ROOT/etc/modules-load.d/vboxnetadp.conf +cp -p %{SOURCE17} $RPM_BUILD_ROOT/etc/modules-load.d/vboxpci.conf + +# And mask module-loading services +ln -sf /dev/null $RPM_BUILD_ROOT%{systemdunitdir}/vboxdrv.service +ln -sf /dev/null $RPM_BUILD_ROOT%{systemdunitdir}/vboxguest.service +ln -sf /dev/null $RPM_BUILD_ROOT%{systemdunitdir}/vboxnetflt.service +ln -sf /dev/null $RPM_BUILD_ROOT%{systemdunitdir}/vboxsf.service +ln -sf /dev/null $RPM_BUILD_ROOT%{systemdunitdir}/vboxnetadp.service +ln -sf /dev/null $RPM_BUILD_ROOT%{systemdunitdir}/vboxpci.service %endif %clean @@ -658,6 +740,7 @@ fi %depmod %{_kernel_ver} /sbin/chkconfig --add vboxguest %service vboxguest restart "VirtualBox Guest additions driver" +%systemd_reload %postun -n kernel%{_alt_kernel}-misc-vboxguest %depmod %{_kernel_ver} @@ -672,6 +755,7 @@ fi %depmod %{_kernel_ver} /sbin/chkconfig --add vboxdrv %service vboxdrv restart "VirtualBox Support Driver" +%systemd_reload %postun -n kernel%{_alt_kernel}-misc-vboxdrv %depmod %{_kernel_ver} @@ -686,6 +770,7 @@ fi %depmod %{_kernel_ver} /sbin/chkconfig --add vboxnetadp %service vboxnetadp restart "VirtualBox Network HostOnly driver" +%systemd_reload %postun -n kernel%{_alt_kernel}-misc-vboxnetadp %depmod %{_kernel_ver} @@ -700,6 +785,7 @@ fi %depmod %{_kernel_ver} /sbin/chkconfig --add vboxnetflt %service vboxnetflt restart "VirtualBox Network Filter driver" +%systemd_reload %postun -n kernel%{_alt_kernel}-misc-vboxnetflt %depmod %{_kernel_ver} @@ -714,6 +800,7 @@ fi %depmod %{_kernel_ver} /sbin/chkconfig --add vboxpci %service vboxnetflt restart "VirtualBox PCI passthrough driver" +%systemd_reload %postun -n kernel%{_alt_kernel}-misc-vboxpci %depmod %{_kernel_ver} @@ -728,6 +815,7 @@ fi %depmod %{_kernel_ver} /sbin/chkconfig --add vboxsf %service vboxsf restart "VirtualBox Host file system access (Shared Folders)" +%systemd_reload %postun -n kernel%{_alt_kernel}-misc-vboxsf %depmod %{_kernel_ver} @@ -747,11 +835,13 @@ fi %if %{with userspace} %files %defattr(644,root,root,755) -%dir %{_libdir}/VirtualBox -%dir %{_libdir}/VirtualBox/ExtensionPacks -%dir %{_libdir}/VirtualBox/additions -%dir %{_libdir}/VirtualBox/components -%dir %{_libdir}/VirtualBox/nls +%dir %{_libdir}/%{pname} +%dir %{_libdir}/%{pname}/ExtensionPacks +%dir %{_libdir}/%{pname}/ExtensionPacks/VNC +%dir %{_libdir}/%{pname}/ExtensionPacks/VNC/linux* +%dir %{_libdir}/%{pname}/additions +%dir %{_libdir}/%{pname}/components +%dir %{_libdir}/%{pname}/nls %attr(755,root,root) %{_bindir}/VBoxBFE %attr(755,root,root) %{_bindir}/VBoxHeadless %attr(755,root,root) %{_bindir}/VBoxManage @@ -761,104 +851,112 @@ fi %attr(755,root,root) %{_bindir}/VBoxXPCOMIPCD %attr(755,root,root) %{_bindir}/VirtualBox %attr(755,root,root) %{_sbindir}/mount.vdi -%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/VBoxBFE -%attr(755,root,root) %{_libdir}/VirtualBox/VBoxBalloonCtrl -%attr(755,root,root) %{_libdir}/VirtualBox/VBoxCreateUSBNode.sh -%attr(755,root,root) %{_libdir}/VirtualBox/VBoxDbg.so -%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/VBoxExtPackHelperApp -%attr(755,root,root) %{_libdir}/VirtualBox/VBoxGuestControlSvc.so -%attr(755,root,root) %{_libdir}/VirtualBox/VBoxGuestPropSvc.so -%attr(755,root,root) %{_libdir}/VirtualBox/VBoxHeadless -%attr(755,root,root) %{_libdir}/VirtualBox/VBoxKeyboard.so -%attr(755,root,root) %{_libdir}/VirtualBox/VBoxManage -%attr(755,root,root) %{_libdir}/VirtualBox/VBoxNetAdpCtl -%attr(755,root,root) %{_libdir}/VirtualBox/VBoxNetDHCP -%attr(755,root,root) %{_libdir}/VirtualBox/VBoxOGLhostcrutil.so -%attr(755,root,root) %{_libdir}/VirtualBox/VBoxOGLhosterrorspu.so -%attr(755,root,root) %{_libdir}/VirtualBox/VBoxOGLrenderspu.so -%attr(755,root,root) %{_libdir}/VirtualBox/VBoxPython*.so -%attr(755,root,root) %{_libdir}/VirtualBox/VBoxREM.so +%attr(755,root,root) %{_libdir}/%{pname}/DBGCPlugInDiggers.so +%attr(755,root,root) %{_libdir}/%{pname}/VBoxAuth.so +%attr(755,root,root) %{_libdir}/%{pname}/VBoxAuthSimple.so +%attr(755,root,root) %{_libdir}/%{pname}/VBoxAutostart +%attr(755,root,root) %{_libdir}/%{pname}/VBoxBFE +%attr(755,root,root) %{_libdir}/%{pname}/VBoxBalloonCtrl +%attr(755,root,root) %{_libdir}/%{pname}/VBoxCreateUSBNode.sh +%attr(755,root,root) %{_libdir}/%{pname}/VBoxDbg.so +%attr(755,root,root) %{_libdir}/%{pname}/VBoxDD2.so +%attr(755,root,root) %{_libdir}/%{pname}/VBoxDD.so +%attr(755,root,root) %{_libdir}/%{pname}/VBoxDDU.so +%attr(755,root,root) %{_libdir}/%{pname}/VBoxDragAndDropSvc.so +%attr(755,root,root) %{_libdir}/%{pname}/VBoxExtPackHelperApp +%attr(755,root,root) %{_libdir}/%{pname}/VBoxGuestControlSvc.so +%attr(755,root,root) %{_libdir}/%{pname}/VBoxGuestPropSvc.so +%attr(755,root,root) %{_libdir}/%{pname}/VBoxHeadless +%attr(755,root,root) %{_libdir}/%{pname}/VBoxHostChannel.so +%attr(755,root,root) %{_libdir}/%{pname}/VBoxKeyboard.so +%attr(755,root,root) %{_libdir}/%{pname}/VBoxManage +%if %{with doc} +%attr(755,root,root) %{_libdir}/%{pname}/VBoxManageHelp +%endif +%attr(755,root,root) %{_libdir}/%{pname}/VBoxNetAdpCtl +%attr(755,root,root) %{_libdir}/%{pname}/VBoxNetDHCP +%attr(755,root,root) %{_libdir}/%{pname}/VBoxOGLhostcrutil.so +%attr(755,root,root) %{_libdir}/%{pname}/VBoxOGLhosterrorspu.so +%attr(755,root,root) %{_libdir}/%{pname}/VBoxOGLrenderspu.so +%attr(755,root,root) %{_libdir}/%{pname}/VBoxPython*.so +%attr(755,root,root) %{_libdir}/%{pname}/VBoxREM.so %ifarch %{ix86} -%attr(755,root,root) %{_libdir}/VirtualBox/VBoxREM32.so -%attr(755,root,root) %{_libdir}/VirtualBox/VBoxREM64.so +%attr(755,root,root) %{_libdir}/%{pname}/VBoxREM32.so +%attr(755,root,root) %{_libdir}/%{pname}/VBoxREM64.so %endif -%attr(755,root,root) %{_libdir}/VirtualBox/VBoxRT.so -%attr(755,root,root) %{_libdir}/VirtualBox/VBoxSDL -%attr(755,root,root) %{_libdir}/VirtualBox/VBoxSharedClipboard.so -%attr(755,root,root) %{_libdir}/VirtualBox/VBoxSharedCrOpenGL.so -%attr(755,root,root) %{_libdir}/VirtualBox/VBoxSharedFolders.so -%attr(755,root,root) %{_libdir}/VirtualBox/VBoxSVC -%attr(755,root,root) %{_libdir}/VirtualBox/VBoxSysInfo.sh -%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/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 -%{_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/VBoxEFI32.fd -%{_libdir}/VirtualBox/VBoxEFI64.fd -%{_libdir}/VirtualBox/components/VBoxXPCOMBase.xpt -%{_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 -%lang(fi) %{_libdir}/VirtualBox/nls/*_fi.qm -%lang(fr) %{_libdir}/VirtualBox/nls/*_fr.qm -%lang(gl_ES) %{_libdir}/VirtualBox/nls/*_gl_ES.qm -%lang(hu) %{_libdir}/VirtualBox/nls/*_hu.qm -%lang(id) %{_libdir}/VirtualBox/nls/*_id.qm -%lang(it) %{_libdir}/VirtualBox/nls/*_it.qm -%lang(ja) %{_libdir}/VirtualBox/nls/*_ja.qm -%lang(km_KH) %{_libdir}/VirtualBox/nls/*_km_KH.qm -%lang(ko) %{_libdir}/VirtualBox/nls/*_ko.qm -%lang(lt) %{_libdir}/VirtualBox/nls/*_lt.qm -%lang(nl) %{_libdir}/VirtualBox/nls/*_nl.qm -%lang(pl) %{_libdir}/VirtualBox/nls/*_pl.qm -%lang(pt) %{_libdir}/VirtualBox/nls/*_pt.qm -%lang(pt_BR) %{_libdir}/VirtualBox/nls/*_pt_BR.qm -%lang(ro) %{_libdir}/VirtualBox/nls/*_ro.qm -%lang(ru) %{_libdir}/VirtualBox/nls/*_ru.qm -%lang(sk) %{_libdir}/VirtualBox/nls/*_sk.qm -%lang(sr) %{_libdir}/VirtualBox/nls/*_sr.qm -%lang(sv) %{_libdir}/VirtualBox/nls/*_sv.qm -%lang(tr) %{_libdir}/VirtualBox/nls/*_tr.qm -%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 +%attr(755,root,root) %{_libdir}/%{pname}/VBoxRT.so +%attr(755,root,root) %{_libdir}/%{pname}/VBoxSDL +%attr(755,root,root) %{_libdir}/%{pname}/VBoxSharedClipboard.so +%attr(755,root,root) %{_libdir}/%{pname}/VBoxSharedCrOpenGL.so +%attr(755,root,root) %{_libdir}/%{pname}/VBoxSharedFolders.so +%attr(755,root,root) %{_libdir}/%{pname}/VBoxSVC +%attr(755,root,root) %{_libdir}/%{pname}/VBoxSysInfo.sh +%attr(755,root,root) %{_libdir}/%{pname}/VBoxTestOGL +%attr(755,root,root) %{_libdir}/%{pname}/VBoxTunctl +%attr(755,root,root) %{_libdir}/%{pname}/VBoxVMM.so +%attr(755,root,root) %{_libdir}/%{pname}/VBoxVMMPreload +%attr(755,root,root) %{_libdir}/%{pname}/VBoxXPCOMC.so +%attr(755,root,root) %{_libdir}/%{pname}/VBoxXPCOMIPCD +%attr(755,root,root) %{_libdir}/%{pname}/VBoxXPCOM.so +%attr(755,root,root) %{_libdir}/%{pname}/VirtualBox +%attr(755,root,root) %{_libdir}/%{pname}/VirtualBox-wrapper.sh +%attr(755,root,root) %{_libdir}/%{pname}/ExtensionPacks/VNC/linux*/VBoxVNC*.so +%{_libdir}/%{pname}/VBoxDD2GC.gc +%{_libdir}/%{pname}/VBoxDDGC.gc +%{_libdir}/%{pname}/VMMGC.gc +%{_libdir}/%{pname}/VBoxDD2R0.r0 +%{_libdir}/%{pname}/VBoxDDR0.r0 +%{_libdir}/%{pname}/VMMR0.r0 +#%{_libdir}/%{pname}/EfiThunk +%{_libdir}/%{pname}/VBoxEFI32.fd +%{_libdir}/%{pname}/VBoxEFI64.fd +%{_libdir}/%{pname}/components/VBoxXPCOMBase.xpt +%{_libdir}/%{pname}/ExtensionPacks/VNC/ExtPack.xml +%{_libdir}/%{pname}/components/VirtualBox_XPCOM.xpt +%attr(755,root,root) %{_libdir}/%{pname}/components/VBoxC.so +%attr(755,root,root) %{_libdir}/%{pname}/components/VBoxSVCM.so +%attr(755,root,root) %{_libdir}/%{pname}/components/VBoxXPCOMIPCC.so +%lang(bg) %{_libdir}/%{pname}/nls/*_bg.qm +%lang(ca) %{_libdir}/%{pname}/nls/*_ca.qm +%lang(ca_VA) %{_libdir}/%{pname}/nls/*_ca_VA.qm +%lang(cs) %{_libdir}/%{pname}/nls/*_cs.qm +%lang(da) %{_libdir}/%{pname}/nls/*_da.qm +%lang(de) %{_libdir}/%{pname}/nls/*_de.qm +%lang(en) %{_libdir}/%{pname}/nls/*_en.qm +%lang(es) %{_libdir}/%{pname}/nls/*_es.qm +%lang(eu) %{_libdir}/%{pname}/nls/*_eu.qm +%lang(fi) %{_libdir}/%{pname}/nls/*_fa_IR.qm +%lang(fi) %{_libdir}/%{pname}/nls/*_fi.qm +%lang(fr) %{_libdir}/%{pname}/nls/*_fr.qm +%lang(gl_ES) %{_libdir}/%{pname}/nls/*_gl_ES.qm +%lang(hu) %{_libdir}/%{pname}/nls/*_hu.qm +%lang(id) %{_libdir}/%{pname}/nls/*_id.qm +%lang(it) %{_libdir}/%{pname}/nls/*_it.qm +%lang(ja) %{_libdir}/%{pname}/nls/*_ja.qm +%lang(km_KH) %{_libdir}/%{pname}/nls/*_km_KH.qm +%lang(ko) %{_libdir}/%{pname}/nls/*_ko.qm +%lang(lt) %{_libdir}/%{pname}/nls/*_lt.qm +%lang(nl) %{_libdir}/%{pname}/nls/*_nl.qm +%lang(pl) %{_libdir}/%{pname}/nls/*_pl.qm +%lang(pt) %{_libdir}/%{pname}/nls/*_pt.qm +%lang(pt_BR) %{_libdir}/%{pname}/nls/*_pt_BR.qm +%lang(ro) %{_libdir}/%{pname}/nls/*_ro.qm +%lang(ru) %{_libdir}/%{pname}/nls/*_ru.qm +%lang(sk) %{_libdir}/%{pname}/nls/*_sk.qm +%lang(sr) %{_libdir}/%{pname}/nls/*_sr.qm +%lang(sv) %{_libdir}/%{pname}/nls/*_sv.qm +%lang(tr) %{_libdir}/%{pname}/nls/*_tr.qm +%lang(uk) %{_libdir}/%{pname}/nls/*_uk.qm +%lang(zh_CN) %{_libdir}/%{pname}/nls/*_zh_CN.qm +%lang(zh_TW) %{_libdir}/%{pname}/nls/*_zh_TW.qm %{_pixmapsdir}/virtualbox.png %{_desktopdir}/*.desktop -%{_libdir}/VirtualBox/icons -%{_libdir}/VirtualBox/virtualbox.xml +%{_libdir}/%{pname}/icons +%{_libdir}/%{pname}/virtualbox.xml %files additions %defattr(644,root,root,755) -%{_libdir}/VirtualBox/additions/VBoxGuestAdditions.iso +%{_libdir}/%{pname}/additions/VBoxGuestAdditions.iso %files guest %defattr(644,root,root,755) @@ -871,10 +969,14 @@ fi /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 -%attr(755,root,root) %{_libdir}/VirtualBox/additions/vboxadd-service -%attr(755,root,root) %{_libdir}/VirtualBox/additions/vboxadd-x11 +%attr(755,root,root) %{_libdir}/%{pname}/additions/autorun.sh +%attr(755,root,root) %{_libdir}/%{pname}/additions/vboxadd +%attr(755,root,root) %{_libdir}/%{pname}/additions/vboxadd-service +%attr(755,root,root) %{_libdir}/%{pname}/additions/vboxadd-x11 +# XXX these files belong to xorg-driver-video-vboxvideo +# but probably 18-system-xorg.patch patch is broken? +%attr(755,root,root) %{_libdir}/%{pname}/additions/vboxvideo_drv_111.so +%attr(755,root,root) %{_libdir}/%{pname}/additions/vboxvideo_drv_112.so %files -n pam-pam_vbox %defattr(644,root,root,755) @@ -883,7 +985,12 @@ fi %if %{with doc} %files doc %defattr(644,root,root,755) +# this is a symlink... +%doc %{_libdir}/%{pname}/UserManual.pdf +%lang(fr) %doc %{_libdir}/%{pname}/UserManual_fr_FR.pdf +# ..to this file %doc %{outdir}/UserManual.pdf +%lang(fr) %doc %{outdir}/UserManual_fr_FR.pdf %endif %files udev @@ -908,34 +1015,52 @@ fi %endif %if %{with kernel} -%files -n kernel%{_alt_kernel}-misc-vboxguest +%files kernel-init-host +%defattr(644,root,root,755) +%attr(754,root,root) /etc/rc.d/init.d/vboxdrv +%attr(754,root,root) /etc/rc.d/init.d/vboxnetadp +%attr(754,root,root) /etc/rc.d/init.d/vboxnetflt +%attr(754,root,root) /etc/rc.d/init.d/vboxpci +%{systemdunitdir}/vboxdrv.service +%{systemdunitdir}/vboxnetadp.service +%{systemdunitdir}/vboxnetflt.service +%{systemdunitdir}/vboxpci.service + +%files kernel-init-guest %defattr(644,root,root,755) %attr(754,root,root) /etc/rc.d/init.d/vboxguest +%attr(754,root,root) /etc/rc.d/init.d/vboxsf +%{systemdunitdir}/vboxguest.service +%{systemdunitdir}/vboxsf.service + +%files -n kernel%{_alt_kernel}-misc-vboxguest +%defattr(644,root,root,755) +%config(noreplace) %verify(not md5 mtime size) /etc/modules-load.d/vboxguest.conf /lib/modules/%{_kernel_ver}/misc/vboxguest.ko* %files -n kernel%{_alt_kernel}-misc-vboxdrv %defattr(644,root,root,755) -%attr(754,root,root) /etc/rc.d/init.d/vboxdrv +%config(noreplace) %verify(not md5 mtime size) /etc/modules-load.d/vboxdrv.conf /lib/modules/%{_kernel_ver}/misc/vboxdrv.ko* %files -n kernel%{_alt_kernel}-misc-vboxnetadp %defattr(644,root,root,755) -%attr(754,root,root) /etc/rc.d/init.d/vboxnetadp +%config(noreplace) %verify(not md5 mtime size) /etc/modules-load.d/vboxnetadp.conf /lib/modules/%{_kernel_ver}/misc/vboxnetadp.ko* %files -n kernel%{_alt_kernel}-misc-vboxnetflt %defattr(644,root,root,755) -%attr(754,root,root) /etc/rc.d/init.d/vboxnetflt +%config(noreplace) %verify(not md5 mtime size) /etc/modules-load.d/vboxnetflt.conf /lib/modules/%{_kernel_ver}/misc/vboxnetflt.ko* %files -n kernel%{_alt_kernel}-misc-vboxpci %defattr(644,root,root,755) -%attr(754,root,root) /etc/rc.d/init.d/vboxpci +%config(noreplace) %verify(not md5 mtime size) /etc/modules-load.d/vboxpci.conf /lib/modules/%{_kernel_ver}/misc/vboxpci.ko* %files -n kernel%{_alt_kernel}-misc-vboxsf %defattr(644,root,root,755) -%attr(754,root,root) /etc/rc.d/init.d/vboxsf +%config(noreplace) %verify(not md5 mtime size) /etc/modules-load.d/vboxsf.conf %attr(755,root,root) %{_sbindir}/mount.vboxsf /lib/modules/%{_kernel_ver}/misc/vboxsf.ko*