packages: VirtualBox/VirtualBox.spec Add vboxguest Conflicts: vboxdrv due t...

[arekm]

Author: arekm                        Date: Thu Jan  7 09:15:04 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
Add vboxguest Conflicts: vboxdrv due to: vboxguest: exports duplicate symbol RTMemExecFree (owned by vboxdrv)

---- Files affected:
packages/VirtualBox:
   VirtualBox.spec (1.249 -> 1.250) 

---- Diffs:

================================================================
Index: packages/VirtualBox/VirtualBox.spec
diff -u packages/VirtualBox/VirtualBox.spec:1.249 packages/VirtualBox/VirtualBox.spec:1.250
--- packages/VirtualBox/VirtualBox.spec:1.249	Tue Dec 29 12:44:20 2009
+++ packages/VirtualBox/VirtualBox.spec	Thu Jan  7 10:14:58 2010
@@ -201,6 +201,7 @@
 %endif
 Provides:	kernel(vboxguest) = %{version}-%{rel}
 Obsoletes:	kernel%{_alt_kernel}-misc-vboxadd
+Conflicts:	kernel%{_alt_kernel}-misc-vboxdrv
 
 %description -n kernel%{_alt_kernel}-misc-vboxguest
 VirtualBox OSE Guest Additions for Linux Module.
@@ -675,6 +676,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.250  2010/01/07 09:14:58  arekm
+Add vboxguest Conflicts: vboxdrv due to: vboxguest: exports duplicate symbol RTMemExecFree (owned by vboxdrv)
+
 Revision 1.249  2009/12/29 11:44:20  glen
 - use desktop file from sources (more complete)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/VirtualBox/VirtualBox.spec?r1=1.249&r2=1.250&f=u