- rebuild for kernel-3.4.3-1

[packages/VirtualBox.git] / VirtualBox.spec

diff --git a/VirtualBox.spec b/VirtualBox.spec
index 964b5ae64b59f18f6a225d0967ed5283046c3c94..9384b89296453a40b1e85acd2ba69d41a0c54075 100644 (file)
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -32,19 +32,19 @@
 %define                _enable_debug_packages  0
 %endif
 
-%define                rel             0.1
+%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.10
+Version:       4.1.16
 Release:       %{rel}
 License:       GPL v2
 Group:         Applications/Emulators
 Source0:       http://download.virtualbox.org/virtualbox/%{version}/%{pname}-%{version}.tar.bz2
-# Source0-md5: 263e495ef3a7ab75943af28d446ee702
+# Source0-md5: eacfb802ecdd6d3435228eb3d3488719
 Source1:       http://download.virtualbox.org/virtualbox/%{version}/VBoxGuestAdditions_%{version}.iso
-# Source1-md5: 322a8fdaec597bc2aad5f8ae8a37f21b
+# Source1-md5: c68ae8540f3135dfe8fba8ba89b87f21
 Source3:       %{pname}-vboxdrv.init
 Source4:       %{pname}-vboxguest.init
 Source5:       %{pname}-vboxnetflt.init
@@ -67,6 +67,7 @@ Patch3:               %{pname}-warning_workaround.patch
 Patch4:                %{pname}-vnc.patch
 Patch5:                %{pname}-dri.patch
 Patch6:                %{pname}-disable_build_NetBiosBin.patch
+Patch7:                xserver-1.12.patch
 # ubuntu patches
 Patch10:               16-no-update.patch
 Patch11:               18-system-xorg.patch
@@ -276,7 +277,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) <= 16.0
 Requires:      xorg-xserver-server(xinput-abi) >= 4.0
 
 %description -n xorg-driver-input-vboxmouse
@@ -292,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) <= 11.0
+Requires:      xorg-xserver-server(videodrv-abi) <= 12.0
 Requires:      xorg-xserver-server(videodrv-abi) >= 2.0
 
 %description -n xorg-driver-video-vboxvideo
@@ -309,12 +310,13 @@ 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 >= 37-0.10
+Requires:      systemd-units >= 38
 Provides:      kernel(vboxguest) = %{version}-%{rel}
 Obsoletes:     kernel%{_alt_kernel}-misc-vboxadd
 Conflicts:     kernel%{_alt_kernel}-misc-vboxdrv
@@ -334,12 +336,13 @@ 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 >= 37-0.10
+Requires:      systemd-units >= 38
 Provides:      kernel(vboxdrv) = %{version}-%{rel}
 
 %description -n kernel%{_alt_kernel}-misc-vboxdrv
@@ -357,13 +360,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
 Requires:      kernel%{_alt_kernel}-misc-vboxdrv
 %if %{with dist_kernel}
 %requires_releq_kernel
 Requires(postun):      %releq_kernel
 %endif
-Requires:      systemd-units >= 37-0.10
+Requires:      systemd-units >= 38
 Provides:      kernel(vboxnetflt) = %{version}-%{rel}
 
 %description -n kernel%{_alt_kernel}-misc-vboxnetadp
@@ -381,13 +385,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
 Requires:      kernel%{_alt_kernel}-misc-vboxdrv
 %if %{with dist_kernel}
 %requires_releq_kernel
 Requires(postun):      %releq_kernel
 %endif
-Requires:      systemd-units >= 37-0.10
+Requires:      systemd-units >= 38
 Provides:      kernel(vboxnetflt) = %{version}-%{rel}
 
 %description -n kernel%{_alt_kernel}-misc-vboxnetflt
@@ -405,13 +410,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
 Requires:      kernel%{_alt_kernel}-misc-vboxdrv
 %if %{with dist_kernel}
 %requires_releq_kernel
 Requires(postun):      %releq_kernel
 %endif
-Requires:      systemd-units >= 37-0.10
+Requires:      systemd-units >= 38
 Provides:      kernel(vboxpci) = %{version}-%{rel}
 
 %description -n kernel%{_alt_kernel}-misc-vboxpci
@@ -430,13 +436,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
 Requires:      kernel%{_alt_kernel}-misc-vboxguest
 %if %{with dist_kernel}
 %requires_releq_kernel
 Requires(postun):      %releq_kernel
 %endif
-Requires:      systemd-units >= 37-0.10
+Requires:      systemd-units >= 38
 Provides:      kernel(vboxsf) = %{version}-%{rel}
 Obsoletes:     kernel%{_alt_kernel}-misc-vboxvfs
 
@@ -474,7 +481,7 @@ You should install this package in your Guest OS.
 Moduł jądra Linuksa dla VirtualBoksa - sterownik obsługi DRM.
 
 %prep
-%setup -q
+%setup -q -n %{pname}-%{version}
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -482,6 +489,7 @@ 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
@@ -522,6 +530,7 @@ kmk -j1 \
 %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
@@ -552,6 +561,7 @@ if cp -al VBox.png $RPM_BUILD_ROOT/Vbox.png 2>/dev/null; then
 fi
 
 cp -a$l %{outdir}/* $RPM_BUILD_ROOT%{_libdir}/%{pname}
+ln -sf %{_docdir}/%{pname}-doc-%{version}/UserManual.pdf $RPM_BUILD_ROOT%{_libdir}/%{pname}/UserManual.pdf
 
 cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_libdir}/VirtualBox/additions/VBoxGuestAdditions.iso
 install -p %{SOURCE10} $RPM_BUILD_ROOT%{_sbindir}/mount.vdi
@@ -909,6 +919,7 @@ fi
 %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}/VirtualBox/additions/vboxvideo_drv_111.so
 
 %files -n pam-pam_vbox
 %defattr(644,root,root,755)
@@ -917,6 +928,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