rpms/VirtualBox-OSE/devel VirtualBox-OSE.spec,1.72,1.73

[Sérgio M. Basto]

Author: sergiomb

Update of /cvs/free/rpms/VirtualBox-OSE/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv30893

Modified Files:
	VirtualBox-OSE.spec 
Log Message:
* Sat Dec 3 2011 Sérgio Basto <sergio at serjux.com> - 4.1.6-3
- increase one release number to override my external link.

* Sat Dec 3 2011 Sérgio Basto <sergio at serjux.com> - 4.1.6-2                                            
- bug #1468, conflict symbols have been fixed upstream.                                                
- bug #2052, drop requirement of HAL in Fedora >= 16.                                                  
- bug #2040, is also fixed.



Index: VirtualBox-OSE.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/devel/VirtualBox-OSE.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- VirtualBox-OSE.spec	2 Dec 2011 23:11:27 -0000	1.72
+++ VirtualBox-OSE.spec	3 Dec 2011 18:13:20 -0000	1.73
@@ -15,7 +15,7 @@
 
 Name:		VirtualBox-OSE
 Version:	4.1.6
-Release:	1%{?prerel:.%{prerel}}%{?dist}
+Release:	3%{?prerel:.%{prerel}}%{?dist}
 Summary:	A general-purpose full virtualizer for PC hardware
 
 Group:		Development/Tools
@@ -88,7 +88,6 @@
 
 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
@@ -119,12 +118,13 @@
 Group:		System Environment/Base
 Requires:	%{name}-kmod = %{version}
 Provides:	%{name}-kmod-common = %{version}
+%if 0%{?fedora} < 16
 Requires:	hal
+%endif 
 Requires:	xorg-x11-server-Xorg
 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 +472,14 @@
 
 
 %changelog
+* Sat Dec 3 2011 Sérgio Basto <sergio at serjux.com> - 4.1.6-3
+- increase one release number to override my external link.
+
+* Sat Dec 3 2011 Sérgio Basto <sergio at serjux.com> - 4.1.6-2
+- bug #1468, conflict symbols have been fixed upstream.
+- bug #2052, drop requirement of HAL in Fedora >= 16.
+- bug #2040, is also fixed (update to 4.1.6).
+
 * Fri Dec 2 2011 Sérgio Basto <sergio at serjux.com> - 4.1.6-1
 - New release
 - drop up streamed patch VirtualBox-OSE-4.1.2-vboxpci.patch