- drop non-dist kernel support

[packages/VirtualBox.git] / VirtualBox.spec

diff --git a/VirtualBox.spec b/VirtualBox.spec
index f7393c7f080e7411535d44f90798b1c31520bf4b..74ddee5eab60f4b18be7bc073219bf8dfdf6f2c7 100644 (file)
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -13,7 +13,6 @@
 # Conditional build:
 %bcond_without doc             # don't build the documentation
 %bcond_without debuginfo               # disable debuginfo creation (to save space when compiling)
-%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
@@ -21,12 +20,6 @@
 %bcond_without dkms            # build dkms package
 %bcond_without verbose
 
-%if %{without kernel}
-%undefine      with_dist_kernel
-%else
-%define                _duplicate_files_terminate_build        0
-%endif
-
 # The goal here is to have main, userspace, package built once with
 # simple release number, and only rebuild kernel packages with kernel
 # version as part of release number, without the need to bump release
@@ -66,14 +59,14 @@ exit 1
 Summary:       VirtualBox - x86 hardware virtualizer
 Summary(pl.UTF-8):     VirtualBox - wirtualizator sprzętu x86
 Name:          %{pname}%{?_pld_builder:%{?with_kernel:-kernel}}%{_alt_kernel}
-Version:       4.3.14
+Version:       4.3.20
 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: 407099867bd9786e23619b5c11611e53
+# Source0-md5: cf3f25644aa0fae1029e8b362bd4375e
 Source1:       http://download.virtualbox.org/virtualbox/%{version}/VBoxGuestAdditions_%{version}.iso
-# Source1-md5: c5be49b6d530ae53685e44b743bc987c
+# Source1-md5: 4f6861ee0c584bcf6819cc76a2bd65ab
 Source2:       vboxservice.init
 Source3:       vboxservice.service
 Source5:       mount.vdi
@@ -95,7 +88,7 @@ Patch9:               pld-guest.patch
 Patch10:       16-no-update.patch
 Patch11:       18-system-xorg.patch
 Patch12:       x8664-build.patch
-Patch13:       %{name}-all-translations.patch
+Patch13:       %{pname}-all-translations.patch
 URL:           http://www.virtualbox.org/
 %if %{with userspace}
 %ifarch %{x8664}
@@ -145,7 +138,7 @@ BuildRequires:      libvpx-devel
 BuildRequires: libxml2-devel >= 2.6.26
 BuildRequires: libxslt-devel >= 1.1.17
 BuildRequires: libxslt-progs >= 1.1.17
-%{?with_lightdm:BuildRequires: lightdm-libs-qt-devel}
+%{?with_lightdm:BuildRequires: lightdm-libs-qt4-devel}
 BuildRequires: makeself
 BuildRequires: mkisofs
 BuildRequires: pam-devel
@@ -172,7 +165,7 @@ BuildRequires:      xerces-c-devel >= 2.6.0
 BuildRequires: yasm
 BuildRequires: zlib-devel >= 1.2.1
 %endif
-%{?with_dist_kernel:%{expand:%kbrs}}
+%{?with_kernel:%{expand:%kbrs}}
 Requires(post,preun):  /sbin/chkconfig
 Requires(postun):      /usr/sbin/groupdel
 Requires(pre): /usr/bin/getgid
@@ -355,7 +348,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) <= 16.0
+Requires:      xorg-xserver-server(videodrv-abi) <= 18.0
 Requires:      xorg-xserver-server(videodrv-abi) >= 2.0
 Provides:      OpenGL = 2.1
 Provides:      OpenGL-GLX = 1.3
@@ -424,11 +417,9 @@ Requires(post,postun):     /sbin/depmod\
 Requires(post):        systemd-units >= 38\
 Requires:      dev >= 2.9.0-7\
 Requires:      systemd-units >= 38\
-%if %{with dist_kernel}\
 %requires_releq_kernel\
 Requires:      %{releq_kernel -n drm}\
 Requires(postun):      %releq_kernel\
-%endif\
 Provides:      kernel(vboxguest) = %{version}-%{rel}\
 Provides:      kernel(vboxsf) = %{version}-%{rel}\
 Provides:      kernel(vboxvideo) = %{version}-%{rel}\
@@ -453,10 +444,8 @@ 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\
 Provides:      kernel(vboxdrv) = %{version}-%{rel}\
 Provides:      kernel(vboxnetadp) = %{version}-%{rel}\
@@ -718,7 +707,7 @@ fakeroot sh -x $RPM_BUILD_ROOT%{_libdir}/%{pname}/scripts/install.sh \
        --root $RPM_BUILD_ROOT
 
 %{__mv} $RPM_BUILD_ROOT{%{_datadir}/%{pname},/lib/udev}/VBoxCreateUSBNode.sh
-cp -p %{SOURCE6} $RPM_BUILD_ROOT/etc/udev/rules.d/10-vboxdrv.rules
+cp -p %{SOURCE6} $RPM_BUILD_ROOT/etc/udev/rules.d/60-vboxdrv.rules
 
 %if %{with dkms}
 mv $RPM_BUILD_ROOT%{_datadir}/%{pname}/src $RPM_BUILD_ROOT%{_usrsrc}/vboxhost-%{version}-%{rel}
@@ -844,23 +833,19 @@ fi
 %addusertogroup xdm vbox
 
 %post -n dkms-vboxguest
-set -x
 dkms add -m vboxguest -v %{version}-%{rel} --rpm_safe_upgrade && \
 dkms build -m vboxguest -v %{version}-%{rel} --rpm_safe_upgrade && \
 dkms install -m vboxguest -v %{version}-%{rel} --rpm_safe_upgrade || :
 
 %preun -n dkms-vboxguest
-set -x
 dkms remove -m vboxguest -v %{version}-%{rel} --rpm_safe_upgrade --all || :
 
 %post -n dkms-vboxhost
-set -x
 dkms add -m vboxhost -v %{version}-%{rel} --rpm_safe_upgrade && \
 dkms build -m vboxhost -v %{version}-%{rel} --rpm_safe_upgrade && \
 dkms install -m vboxhost -v %{version}-%{rel} --rpm_safe_upgrade || :
 
 %preun -n dkms-vboxhost
-set -x
 dkms remove -m vboxhost -v %{version}-%{rel} --rpm_safe_upgrade --all || :
 
 %if %{with userspace}