SPECS: VirtualBox.spec - accept spaces in configure args - prep so...

[glen]

Author: glen                         Date: Wed Feb 27 16:46:30 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- accept spaces in configure args
- prep source in %prep

---- Files affected:
SPECS:
   VirtualBox.spec (1.63 -> 1.64) 

---- Diffs:

================================================================
Index: SPECS/VirtualBox.spec
diff -u SPECS/VirtualBox.spec:1.63 SPECS/VirtualBox.spec:1.64
--- SPECS/VirtualBox.spec:1.63	Fri Feb 22 17:56:20 2008
+++ SPECS/VirtualBox.spec	Wed Feb 27 17:46:25 2008
@@ -44,6 +44,7 @@
 Patch1:		%{pname}-qt-paths.patch
 Patch2:		%{pname}-shared-libstdc++.patch
 Patch3:		%{pname}-disable-xclient-build.patch
+Patch4:		%{pname}-configure-spaces.patch
 URL:		http://www.virtualbox.org/
 BuildRequires:	SDL-devel
 BuildRequires:	alsa-lib-devel
@@ -235,38 +236,40 @@
 %patch3 -p1
 %endif
 
+%patch4 -p1
+
 cat <<'EOF' > udev.conf
 KERNEL=="vboxdrv", NAME="%k", GROUP="vbox", MODE="0660"
 EOF
 
 install %{SOURCE1} .
 
-%build
-KDIR="%{_builddir}/%{buildsubdir}/kernel"
-mkdir -p $KDIR
-cp -Ra %{_kernelsrcdir}/include $KDIR
+# XXX: why this copying is needed? it writes there?
+install -d kernel
+cp -a %{_kernelsrcdir}/include kernel
 %ifarch %{x8664} %{ix86}
-if [ -d $KDIR/include/asm-x86 ]; then
-	ln -sf $KDIR/include/asm-x86 $KDIR/include/asm
+if [ -d kernel/include/asm-x86 ]; then
+	ln -sf asm-x86 kernel/include/asm
 else
 %ifarch %{x8664}
-	ln -sf $KDIR/include/asm-x86_64 $KDIR/include/asm
+	ln -sf asm-x86_64 kernel/include/asm
 %else
-	ln -sf $KDIR/include/asm-i386 $KDIR/include/asm
+	ln -sf asm-i386 kernel/include/asm
 %endif
 fi
 %endif
 
 %if %{with dist_kernel}
-ln -sf $KDIR/include/linux/autoconf-dist.h $KDIR/include/linux/autoconf.h
+ln -sf autoconf-dist.h kernel/include/linux/autoconf.h
 %else
-ln -sf $KDIR/include/linux/autoconf-nondist.h $KDIR/include/linux/autoconf.h
+ln -sf autoconf-nondist.h kernel/include/linux/autoconf.h
 %endif
 
+%build
 ./configure \
 	--with-gcc="%{__cc}" \
 	--with-g++="%{__cxx}" \
-	--with-linux="$KDIR"
+	--with-linux="%{_builddir}/%{buildsubdir}/kernel"
 
 %if %{with userspace}
 . ./env.sh && kmk -j1
@@ -489,6 +492,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.64  2008-02-27 16:46:25  glen
+- accept spaces in configure args
+- prep source in %prep
+
 Revision 1.63  2008-02-22 16:56:20  arvenil
 - update also UserManual.pdf
 
================================================================

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