SPECS: VirtualBox.spec - AC-branch merges

[glen]

Author: glen                         Date: Fri Feb 29 18:10:28 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- AC-branch merges

---- Files affected:
SPECS:
   VirtualBox.spec (1.66 -> 1.67) 

---- Diffs:

================================================================
Index: SPECS/VirtualBox.spec
diff -u SPECS/VirtualBox.spec:1.66 SPECS/VirtualBox.spec:1.67
--- SPECS/VirtualBox.spec:1.66	Fri Feb 29 17:14:54 2008
+++ SPECS/VirtualBox.spec	Fri Feb 29 19:10:22 2008
@@ -139,7 +139,7 @@
 %package udev
 Summary:	udev rules for VirtualBox kernel modules
 Summary(pl.UTF-8):	Reguły udev dla modułów jądra Linuksa dla VirtualBoksa
-Release:	%{rel}@%{_kernel_ver_str}
+Release:	%{rel}
 Group:		Base/Kernel
 Requires:	udev
 
@@ -256,6 +256,11 @@
 ../src/VBox/HostDrivers/Support/linux/export_modules modules.tar.gz && \
 	tar -zxf modules.tar.gz && rm -f modules.tar.gz
 
+%ifarch %{x8664}
+# HACK, is this really safe on x86_64?
+sed -i -e '/#.*define.*RTMEMALLOC_EXEC_HEAP/d' vboxadd/r0drv/linux/alloc-r0drv-linux.c vboxvfs/r0drv/linux/alloc-r0drv-linux.c
+%endif
+
 %build
 %if %{with userspace}
 ./configure \
@@ -268,11 +273,6 @@
 
 %if %{with kernel}
 cd PLD-MODULE-BUILD
-%ifarch %{x8664}
-# HACK, is this really safe on x86_64?
-sed -i -e 's:#.*define.*RTMEMALLOC_EXEC_HEAP::g' vboxadd/r0drv/linux/alloc-r0drv-linux.c vboxvfs/r0drv/linux/alloc-r0drv-linux.c
-%endif
-
 %build_kernel_modules -m vboxadd -C vboxadd
 %build_kernel_modules -m vboxdrv -C vboxdrv
 cp -a vboxadd/Module.symvers vboxvfs
@@ -471,6 +471,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.67  2008-02-29 18:10:22  glen
+- AC-branch merges
+
 Revision 1.66  2008-02-29 16:14:54  zbyniu
 - don't search for kernel headers when build userspace
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/VirtualBox.spec?r1=1.66&r2=1.67&f=u