rpms/VirtualBox-OSE/devel VirtualBox-OSE.spec,1.73,1.74
Author: sergiomb
Update of /cvs/free/rpms/VirtualBox-OSE/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv6453
Modified Files:
VirtualBox-OSE.spec
Log Message:
* Mon Dec 5 2011 Sérgio Basto <sergio(a)serjux.com> - 4.1.6-4
- revert change for "bug #1468, conflict symbols have been fixed upstream".
Index: VirtualBox-OSE.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/devel/VirtualBox-OSE.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- VirtualBox-OSE.spec 3 Dec 2011 18:13:20 -0000 1.73
+++ VirtualBox-OSE.spec 5 Dec 2011 08:20:56 -0000 1.74
@@ -15,7 +15,7 @@
Name: VirtualBox-OSE
Version: 4.1.6
-Release: 3%{?prerel:.%{prerel}}%{?dist}
+Release: 4%{?prerel:.%{prerel}}%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
Group: Development/Tools
@@ -88,6 +88,7 @@
Requires: %{name}-kmod = %{version}%{?prereltag}
Provides: %{name}-kmod-common = %{version}%{?prereltag}
+Conflicts: %{name}-guest <= %{version}-%{release}
%description
A general-purpose full virtualizer and emulator for 32-bit and
@@ -125,6 +126,7 @@
Requires: xorg-x11-xinit
Provides: xorg-x11-drv-VirtualBox-OSE = %{version}-%{release}
Obsoletes: xorg-x11-drv-VirtualBox-OSE < %{version}-%{release}
+Conflicts: %{name} <= %{version}-%{release}
%if "%(xserver-sdk-abi-requires 2>/dev/null)"
Requires: %(xserver-sdk-abi-requires ansic)
Requires: %(xserver-sdk-abi-requires videodrv)
@@ -472,6 +474,9 @@
%changelog
+* Mon Dec 5 2011 Sérgio Basto <sergio(a)serjux.com> - 4.1.6-4
+- revert change for "bug #1468, conflict symbols have been fixed upstream".
+
* Sat Dec 3 2011 Sérgio Basto <sergio(a)serjux.com> - 4.1.6-3
- increase one release number to override my external link.