rpms/VirtualBox-OSE/devel .cvsignore, 1.21, 1.22 VirtualBox-OSE-guest.modules, 1.5, 1.6 VirtualBox-OSE.modules, 1.5, 1.6 VirtualBox-OSE.spec, 1.52, 1.53 sources, 1.21, 1.22 VirtualBox-OSE.blacklist-kvm, 1.1, NONE

[Lubomir Rintel]

Author: lkundrak

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

Modified Files:
	.cvsignore VirtualBox-OSE-guest.modules VirtualBox-OSE.modules 
	VirtualBox-OSE.spec sources 
Removed Files:
	VirtualBox-OSE.blacklist-kvm 
Log Message:
* Thu Jun 17 2010 Lubomir Rintel <lkundrak at v3.sk> - 3.2.4-1
- New release
- Do not use /usr/bin/xargs in module script (Piergiorgio Sartor, #1256)
- No longer blacklist KVM (Nicolas Chauvet, #1280)
- Hypervisor conflicts with guest (Henrique Martins, #1239)



Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	19 May 2010 08:36:31 -0000	1.21
+++ .cvsignore	17 Jun 2010 13:46:54 -0000	1.22
@@ -1,2 +1,2 @@
-VirtualBox-3.2.0-OSE.tar.bz2
 UserManual.pdf
+VirtualBox-3.2.4-OSE.tar.bz2


Index: VirtualBox-OSE-guest.modules
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/devel/VirtualBox-OSE-guest.modules,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- VirtualBox-OSE-guest.modules	18 May 2010 16:51:38 -0000	1.5
+++ VirtualBox-OSE-guest.modules	17 Jun 2010 13:46:57 -0000	1.6
@@ -4,7 +4,7 @@
 insert_module ()
 {
         grep -qR "^[ \t]*blacklist[ \t][ \t]*$1[ \t]*" /etc/modprobe.d && return
-        modinfo $1 |awk '/filename:/ {print $2}' |xargs -r insmod
+        modinfo $1 |awk '/filename:/ {print "insmod "$2}' |$SHELL
 }
 
 insert_module vboxguest


Index: VirtualBox-OSE.modules
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/devel/VirtualBox-OSE.modules,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- VirtualBox-OSE.modules	26 Mar 2010 13:14:23 -0000	1.5
+++ VirtualBox-OSE.modules	17 Jun 2010 13:46:58 -0000	1.6
@@ -9,7 +9,7 @@
 insert_module ()
 {
 	grep -qR "^[ \t]*blacklist[ \t][ \t]*$1[ \t]*" /etc/modprobe.d && return
-	modinfo $1 |awk '/filename:/ {print $2}' |xargs -r insmod
+	modinfo $1 |awk '/filename:/ {print "insmod "$2}' |$SHELL
 }
 
 insert_module vboxdrv


Index: VirtualBox-OSE.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/devel/VirtualBox-OSE.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- VirtualBox-OSE.spec	19 May 2010 08:36:31 -0000	1.52
+++ VirtualBox-OSE.spec	17 Jun 2010 13:46:58 -0000	1.53
@@ -28,7 +28,6 @@
 Source6:	VirtualBox-OSE.modules
 Source7:	VirtualBox-OSE-guest.modules
 Source8:	VirtualBox-OSE-vboxresize.desktop
-Source9:	VirtualBox-OSE.blacklist-kvm
 Patch1:		VirtualBox-OSE-3.2.0-noupdate.patch
 Patch2:		VirtualBox-OSE-3.2.0-strings.patch
 Patch3:		VirtualBox-OSE-3.1.0-libcxx.patch
@@ -76,8 +75,9 @@
 ExclusiveArch:	i386 x86_64
 %endif
 
-Requires:	%{name}-kmod = %{version}
-Provides:	%{name}-kmod-common = %{version}
+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
@@ -113,6 +113,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}
 
 %description guest
 Tools that utilize kernel modules for supporting integration
@@ -123,7 +124,6 @@
 %package kmodsrc
 Summary:	%{name} kernel module source code
 Group:		System Environment/Kernel
-Provides:       %{name}(kmodabi) = %{version}%{?prereltag}
 
 %description kmodsrc
 Source tree used for building kernel module packages (%{name}-kmod)
@@ -301,7 +301,6 @@
 # Install modules load script
 install -p -m 0755 -D %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/modules/%{name}.modules
 install -p -m 0755 -D %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/modules/%{name}-guest.modules
-install -p -m 0644 -D %{SOURCE9} $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/blacklist-kvm.conf
 
 # Module Source Code
 mkdir -p %{name}-kmod-%{version}
@@ -403,7 +402,6 @@
 %config %{_sysconfdir}/vbox/vbox.cfg
 %config %{_sysconfdir}/udev/rules.d/90-vboxdrv.rules
 %config %{_sysconfdir}/sysconfig/modules/%{name}.modules
-%config(noreplace) %{_sysconfdir}/modprobe.d/*.conf
 %doc COPYING
 
 
@@ -442,6 +440,12 @@
 
 
 %changelog
+* Thu Jun 17 2010 Lubomir Rintel <lkundrak at v3.sk> - 3.2.4-1
+- New release
+- Do not use /usr/bin/xargs in module script (Piergiorgio Sartor, #1256)
+- No longer blacklist KVM (Nicolas Chauvet, #1280)
+- Hypervisor conflicts with guest (Henrique Martins, #1239)
+
 * Wed May 19 2010 Lubomir Rintel <lkundrak at v3.sk> - 3.2.0-1
 - Release
 


Index: sources
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	19 May 2010 08:36:31 -0000	1.21
+++ sources	17 Jun 2010 13:46:58 -0000	1.22
@@ -1,2 +1,2 @@
-26756f4eaeb7ff2c719c0abec18a465f  VirtualBox-3.2.0-OSE.tar.bz2
-ba052067cdc25a0c36fd0a84e7b9ff98  UserManual.pdf
+9c3f21a2011aa4c041f146df90359470  UserManual.pdf
+3ed76bc4048f399dc0465ed0a7f666d8  VirtualBox-3.2.4-OSE.tar.bz2


--- VirtualBox-OSE.blacklist-kvm DELETED ---