SPECS: VirtualBox.spec - hardcode _libdir in wrapper script - don't guess a...

sparky sparky at pld-linux.org
Fri Dec 5 23:58:37 CET 2008


Author: sparky                       Date: Fri Dec  5 22:58:37 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- hardcode _libdir in wrapper script - don't guess at startup

---- Files affected:
SPECS:
   VirtualBox.spec (1.156 -> 1.157) 

---- Diffs:

================================================================
Index: SPECS/VirtualBox.spec
diff -u SPECS/VirtualBox.spec:1.156 SPECS/VirtualBox.spec:1.157
--- SPECS/VirtualBox.spec:1.156	Mon Dec  1 18:16:04 2008
+++ SPECS/VirtualBox.spec	Fri Dec  5 23:58:29 2008
@@ -276,6 +276,7 @@
 EOF
 
 install %{SOURCE1} .
+sed 's#@LIBDIR@#%{_libdir}#' < %{SOURCE7} > VirtualBox-wrapper.sh
 
 rm -rf PLD-MODULE-BUILD && mkdir PLD-MODULE-BUILD && cd PLD-MODULE-BUILD
 ../src/VBox/Additions/linux/export_modules modules.tar.gz
@@ -320,7 +321,7 @@
 	$RPM_BUILD_ROOT{%{_bindir},%{_pixmapsdir},%{_desktopdir}} \
 	$RPM_BUILD_ROOT%{_libdir}/VirtualBox
 
-install %{SOURCE7} $RPM_BUILD_ROOT%{_libdir}/VirtualBox/VirtualBox-wrapper.sh
+install VirtualBox-wrapper.sh $RPM_BUILD_ROOT%{_libdir}/VirtualBox
 for f in {VBox{BFE,Headless,Manage,SDL,SVC,Tunctl,XPCOMIPCD},VirtualBox,vditool}; do
 	install out/linux.%{outdir}/release/bin/$f $RPM_BUILD_ROOT%{_libdir}/VirtualBox/$f
 	ln -s %{_libdir}/VirtualBox/VirtualBox-wrapper.sh $RPM_BUILD_ROOT%{_bindir}/$f
@@ -533,6 +534,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.157  2008/12/05 22:58:29  sparky
+- hardcode _libdir in wrapper script - don't guess at startup
+
 Revision 1.156  2008/12/01 17:16:04  wolvverine
 - rel.2:2.6.27.7-3
 
================================================================

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



More information about the pld-cvs-commit mailing list