- rebuild with xserver 1.15

[packages/VirtualBox.git] / VirtualBox.spec

diff --git a/VirtualBox.spec b/VirtualBox.spec
index 4469963e9787bcba5021747d083787f3bbca53eb..f6cd7456b711c1afc9bd768c0888e5465cb89b9e 100644 (file)
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -47,23 +47,24 @@ exit 1
 %define                _enable_debug_packages  0
 %endif
 
+%define                kbrs    %(echo %{_build_kernels} | tr , '\\n' | while read n ; do echo %%undefine alt_kernel ; [ -z "$n" ] || echo %%define alt_kernel $n ; echo "BuildRequires:kernel%%{_alt_kernel}-module-build >= 3:2.6.20.2" ; done)
 %define                kpkg    %(echo %{_build_kernels} | tr , '\\n' | while read n ; do echo %%undefine alt_kernel ; [ -z "$n" ] || echo %%define alt_kernel $n ; echo %%kernel_pkg ; done)
 %define                bkpkg   %(echo %{_build_kernels} | tr , '\\n' | while read n ; do echo %%undefine alt_kernel ; [ -z "$n" ] || echo %%define alt_kernel $n ; echo %%build_kernel_pkg ; done)
 %define                ikpkg   %(echo %{_build_kernels} | tr , '\\n' | while read n ; do echo %%undefine alt_kernel ; [ -z "$n" ] || echo %%define alt_kernel $n ; echo %%install_kernel_pkg ; done)
 
-%define                rel             1
+%define                rel             2
 %define                pname           VirtualBox
 Summary:       VirtualBox - x86 hardware virtualizer
 Summary(pl.UTF-8):     VirtualBox - wirtualizator sprzętu x86
-Name:          %{pname}%{_alt_kernel}
-Version:       4.3.0
-Release:       %{rel}%{?with_kernel:@%{_kernel_ver_str}}
+Name:          %{pname}%{?_pld_builder:%{?with_kernel:-kernel}}%{_alt_kernel}
+Version:       4.3.6
+Release:       %{rel}%{?_pld_builder:%{?with_kernel:@%{_kernel_ver_str}}}
 License:       GPL v2
 Group:         Applications/Emulators
 Source0:       http://download.virtualbox.org/virtualbox/%{version}/%{pname}-%{version}.tar.bz2
-# Source0-md5: 1f49237686d095859f3dbea0941f8b12
+# Source0-md5: 4bc874039f169215152fb40ca5062784
 Source1:       http://download.virtualbox.org/virtualbox/%{version}/VBoxGuestAdditions_%{version}.iso
-# Source1-md5: 6b72a59aba1660afa4f430faa88d727a
+# Source1-md5: 13ea7dddbd3da36c76a6ee734a2b6a70
 Source2:       vboxservice.init
 Source3:       vboxservice.service
 Source4:       %{pname}.sh
@@ -113,6 +114,7 @@ BuildRequires:      bin86
 BuildRequires: curl-devel
 BuildRequires: device-mapper-devel
 %{?with_doc:BuildRequires:     docbook-dtd44-xml}
+%{?with_lightdm:BuildRequires: fltk-devel}
 BuildRequires: gcc >= 5:3.2.3
 %{?with_webservice:BuildRequires:      gsoap-devel}
 BuildRequires: issue
@@ -125,6 +127,7 @@ BuildRequires:      libstdc++-devel >= 5:3.2.3
 BuildRequires: libstdc++-static >= 5:3.2.3
 BuildRequires: libuuid-devel
 BuildRequires: libvncserver-devel >= 0.9.9
+BuildRequires: libvpx-devel
 BuildRequires: libxml2-devel >= 2.6.26
 BuildRequires: libxslt-devel >= 1.1.17
 BuildRequires: libxslt-progs >= 1.1.17
@@ -155,7 +158,7 @@ BuildRequires:      xerces-c-devel >= 2.6.0
 BuildRequires: yasm
 BuildRequires: zlib-devel >= 1.2.1
 %endif
-%{?with_dist_kernel:BuildRequires:     kernel%{_alt_kernel}-module-build >= 3:2.6.20.2}
+%{?with_dist_kernel:%{expand:%kbrs}}
 Requires(post,preun):  /sbin/chkconfig
 Requires(postun):      /usr/sbin/groupdel
 Requires(pre): /usr/bin/getgid
@@ -250,8 +253,8 @@ Summary:    VirtualBox Guest tools
 Group:         Base
 Requires(post,preun):  /sbin/chkconfig
 Requires(post):        systemd-units >= 38
-Requires:      systemd-units >= 38
 Requires:      rc-scripts
+Requires:      systemd-units >= 38
 Suggests:      kernel(vboxguest)
 Suggests:      kernel(vboxsf)
 Suggests:      pam-pam_vbox
@@ -315,8 +318,9 @@ 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) <= 14.1
+Requires:      xorg-xserver-server(videodrv-abi) <= 15.0
 Requires:      xorg-xserver-server(videodrv-abi) >= 2.0
+Provides:      xorg-driver-video
 
 %description -n xorg-driver-video-vboxvideo
 X.org video driver for VirtualBox guest OS.
@@ -340,10 +344,9 @@ Requires:  dev >= 2.9.0-7\
 Requires:      systemd-units >= 38\
 %if %{with dist_kernel}\
 %requires_releq_kernel\
-%requires_releq_kernel -n drm\
+Requires:      %{releq_kernel -n drm}\
 Requires(postun):      %releq_kernel\
 %endif\
-Suggests:      %{name}-kernel-init-guest >= %{version}-%{rel}\
 Provides:      kernel(vboxguest) = %{version}-%{rel}\
 Provides:      kernel(vboxsf) = %{version}-%{rel}\
 Provides:      kernel(vboxvideo) = %{version}-%{rel}\
@@ -373,7 +376,6 @@ Requires:   dev >= 2.9.0-7\
 Requires(postun):      %releq_kernel\
 %endif\
 Requires:      systemd-units >= 38\
-Suggests:      %{name}-kernel-init-host >= %{version}-%{rel}\
 Provides:      kernel(vboxdrv) = %{version}-%{rel}\
 Provides:      kernel(vboxnetadp) = %{version}-%{rel}\
 Provides:      kernel(vboxnetflt) = %{version}-%{rel}\
@@ -617,8 +619,9 @@ cp -p %{objdir}/Additions/Installer/linux/share/VBoxGuestAdditions/vbox-greeter.
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/scripts/install_service
 %endif
 
-# packaged by kernel part
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/additions/mount.vboxsf
+
+install -p mount.vboxsf $RPM_BUILD_ROOT/sbin/mount.vboxsf
 %endif
 
 %if %{with kernel}
@@ -626,8 +629,6 @@ install -d $RPM_BUILD_ROOT{/etc/modules-load.d,/sbin}
 
 cp -a PLD-MODULE-BUILD/installed/* $RPM_BUILD_ROOT
 
-install -p mount.vboxsf $RPM_BUILD_ROOT/sbin/mount.vboxsf
-
 # Tell systemd to load modules
 cp -p %{SOURCE7} $RPM_BUILD_ROOT/etc/modules-load.d/virtualbox-host.conf
 cp -p %{SOURCE8} $RPM_BUILD_ROOT/etc/modules-load.d/virtualbox-guest.conf