- really rediff libpath patch

- make the two dkms packages conflict as both of them export the same symbol (Debian)
- update 16-no-update.patch, now it hides the update menu item and settings page
  instead of disabling them (Debian)


SILENT: svn-revision: 560895
This commit is contained in:
ahmadsamir 2010-07-27 00:45:19 +00:00 committed by ahmadsamir
parent 079e5c5327
commit 2a2f730e4f

View file

@ -103,6 +103,7 @@ Summary: VirtualBox OSE kernel module
Group: System/Kernel and hardware Group: System/Kernel and hardware
Requires(post): dkms Requires(post): dkms
Requires(preun): dkms Requires(preun): dkms
Conflicts: dkms-vboxadditions
%description -n dkms-%{name} %description -n dkms-%{name}
Kernel support for VirtualBox OSE. Kernel support for VirtualBox OSE.
@ -140,6 +141,7 @@ Provides: dkms-vboxsf = %{version}-%{release}
Obsoletes: dkms-vboxsf < %{version}-%{release} Obsoletes: dkms-vboxsf < %{version}-%{release}
Provides: dkms-vboxvideo = %{version}-%{release} Provides: dkms-vboxvideo = %{version}-%{release}
Obsoletes: dkms-vboxvideo < %{version}-%{release} Obsoletes: dkms-vboxvideo < %{version}-%{release}
Conflicts: dkms-%{name}
%description -n dkms-vboxadditions %description -n dkms-vboxadditions
Kernel module for VirtualBox OSE additions. Kernel module for VirtualBox OSE additions.
@ -164,7 +166,7 @@ The X.org driver for video in VirtualBox guests
%prep %prep
%setup -q -n %{distname} %setup -q -n %{distname}
%patch1 -b .libpath-3.1 %patch1 -p1 -b .libpath-3.2.6
%patch2 -p1 -b .kernelrelease %patch2 -p1 -b .kernelrelease
%patch4 -p1 -b .futex %patch4 -p1 -b .futex
%patch5 -p1 -b .fix-timesync-req %patch5 -p1 -b .fix-timesync-req