SPECS: VirtualBox.spec - file creation moved to %prep

glen glen at pld-linux.org
Tue Mar 13 18:15:10 CET 2007


Author: glen                         Date: Tue Mar 13 17:15:10 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- file creation moved to %prep

---- Files affected:
SPECS:
   VirtualBox.spec (1.14 -> 1.15) 

---- Diffs:

================================================================
Index: SPECS/VirtualBox.spec
diff -u SPECS/VirtualBox.spec:1.14 SPECS/VirtualBox.spec:1.15
--- SPECS/VirtualBox.spec:1.14	Tue Mar 13 18:13:54 2007
+++ SPECS/VirtualBox.spec	Tue Mar 13 18:15:05 2007
@@ -145,6 +145,25 @@
 %patch0 -p0
 %patch1 -p0
 
+cat > VBox.sh <<'EOF'
+#!/bin/sh
+
+if [ ! -c /dev/vboxdrv ]; then
+	echo "Special character device /dev/vboxdrv doesn't exists!"
+	echo "Check your installation and if vboxdrv kernel module is loaded."
+	exit 1
+fi
+
+if [ ! -w /dev/vboxdrv ]; then
+	echo "You don't have write access to /dev/vboxdrv!"
+	echo "Correct this situation or contact with your system administrator."
+	exit 1
+fi
+
+BINFILE=$(basename "$0")
+LD_LIBRARY_PATH=%{_libdir}/VirtualBox %{_libdir}/VirtualBox/$BINFILE ${1:+"$@"}
+EOF
+
 %build
 KDIR="%{_builddir}/%{buildsubdir}/kernel"
 mkdir -p $KDIR
@@ -203,29 +222,9 @@
 	$RPM_BUILD_ROOT%{_libdir}/VirtualBox \
 	$RPM_BUILD_ROOT/etc/rc.d/init.d
 
-cat > VBox.sh <<'EOF'
-#!/bin/sh
-
-if [ ! -c /dev/vboxdrv ]; then
-	echo "Special character device /dev/vboxdrv doesn't exists!"
-	echo "Check your installation and if vboxdrv kernel module is loaded."
-	exit 1
-fi
-
-if [ ! -w /dev/vboxdrv ]; then
-	echo "You don't have write access to /dev/vboxdrv!"
-	echo "Correct this situation or contact with your system administrator."
-	exit 1
-fi
-
-BINFILE=$(basename "$0")
-LD_LIBRARY_PATH=%{_libdir}/VirtualBox %{_libdir}/VirtualBox/$BINFILE ${1:+"$@"}
-EOF
-
-for f in {VBox{BFE,Manage,SDL,SVC,XPCOMIPCD},VirtualBox}
-do
-install out/linux.%{_outdir}/release/bin/$f $RPM_BUILD_ROOT%{_libdir}/VirtualBox/$f
-install VBox.sh $RPM_BUILD_ROOT%{_bindir}/$f
+for f in {VBox{BFE,Manage,SDL,SVC,XPCOMIPCD},VirtualBox}; do
+	install out/linux.%{_outdir}/release/bin/$f $RPM_BUILD_ROOT%{_libdir}/VirtualBox/$f
+	install VBox.sh $RPM_BUILD_ROOT%{_bindir}/$f
 done
 
 install out/linux.%{_outdir}/release/bin/VBox{C,DD,DD2,REM,REMImp,RT,VMM,XML,XPCOM,XPCOMIPCC}.so \
@@ -306,6 +305,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.15  2007/03/13 17:15:05  glen
+- file creation moved to %prep
+
 Revision 1.14  2007/03/13 17:13:54  glen
 - use 'EOF' (no interpolation); tabs
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/VirtualBox.spec?r1=1.14&r2=1.15&f=u



More information about the pld-cvs-commit mailing list