packages: VirtualBox-bin/VirtualBox-bin.spec - install current python, cosm...

[glen]

Author: glen                         Date: Sat May 14 19:57:43 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- install current python, cosmetics

---- Files affected:
packages/VirtualBox-bin:
   VirtualBox-bin.spec (1.49 -> 1.50) 

---- Diffs:

================================================================
Index: packages/VirtualBox-bin/VirtualBox-bin.spec
diff -u packages/VirtualBox-bin/VirtualBox-bin.spec:1.49 packages/VirtualBox-bin/VirtualBox-bin.spec:1.50
--- packages/VirtualBox-bin/VirtualBox-bin.spec:1.49	Mon Apr 25 12:55:23 2011
+++ packages/VirtualBox-bin/VirtualBox-bin.spec	Sat May 14 21:57:37 2011
@@ -273,18 +273,18 @@
 	$RPM_BUILD_ROOT{%{_bindir},%{_pixmapsdir},%{_desktopdir}} \
 	$RPM_BUILD_ROOT%{_libdir}/VirtualBox/components
 
-install VirtualBox-wrapper.sh $RPM_BUILD_ROOT%{_libdir}/VirtualBox
+install -p VirtualBox-wrapper.sh $RPM_BUILD_ROOT%{_libdir}/VirtualBox
 for f in {VBox{Headless,Manage,Net{AdpCtl,DHCP},SDL,SysInfo.sh,SVC,TestOGL,Tunctl,XPCOMIPCD,.sh},VirtualBox,rdesktop-vrdp,vboxwebsrv,webtest}; do
-	install $f $RPM_BUILD_ROOT%{_libdir}/VirtualBox/$f
+	install -p $f $RPM_BUILD_ROOT%{_libdir}/VirtualBox/$f
 done
 
 for f in {VBox{Headless,Manage,SDL,VRDP},VirtualBox,rdesktop-vrdp,vboxwebsrv}; do
 	ln -s %{_libdir}/VirtualBox/VirtualBox-wrapper.sh $RPM_BUILD_ROOT%{_bindir}/$f
 done
 
-install libQt*.so.* VBox*.so VirtualBox.so \
+install -p libQt*.so.* VBox*.so VirtualBox.so \
 	$RPM_BUILD_ROOT%{_libdir}/VirtualBox
-install VBox{DD,DD2}{GC.gc,R0.r0} VMM{GC.gc,R0.r0} \
+install -p VBox{DD,DD2}{GC.gc,R0.r0} VMM{GC.gc,R0.r0} \
 	$RPM_BUILD_ROOT%{_libdir}/VirtualBox
 
 for f in VBox{DDU,REM,RT,VMM,XPCOM}.so; do
@@ -293,24 +293,29 @@
 
 cp -a accessible additions components nls rdesktop-vrdp-keymaps $RPM_BUILD_ROOT%{_libdir}/VirtualBox
 
-install VBox.png $RPM_BUILD_ROOT%{_pixmapsdir}/VBox.png
-install %{SOURCE8} $RPM_BUILD_ROOT%{_desktopdir}/%{pname}.desktop
+cp -p VBox.png $RPM_BUILD_ROOT%{_pixmapsdir}/VBox.png
+cp -p %{SOURCE8} $RPM_BUILD_ROOT%{_desktopdir}/%{pname}.desktop
 
-install VirtualBox.chm $RPM_BUILD_ROOT%{_libdir}/VirtualBox
+cp -p VirtualBox.chm $RPM_BUILD_ROOT%{_libdir}/VirtualBox
 
 # required by VBoxFFmpegFB.so
 ln -s %{_libdir}/libavcodec.so.5? $RPM_BUILD_ROOT%{_libdir}/VirtualBox/libavcodec.so.51
 ln -s %{_libdir}/libavformat.so.5? $RPM_BUILD_ROOT%{_libdir}/VirtualBox/libavformat.so.51
 
 install -d $RPM_BUILD_ROOT/etc/udev/rules.d
-cp -a %{SOURCE10} $RPM_BUILD_ROOT/etc/udev/rules.d/virtualbox.rules
+cp -p %{SOURCE10} $RPM_BUILD_ROOT/etc/udev/rules.d/virtualbox.rules
+
+# install just for current python
+py_ver=$(%{__python} -c 'import sys; sv=sys.version_info; print "%s_%s" % (sv.major, sv.minor)')
+rm -f $RPM_BUILD_ROOT%{_libdir}/VirtualBox/VBoxPython*.so
+install -p VBoxPython.so VBoxPython$py_ver.so $RPM_BUILD_ROOT%{_libdir}/VirtualBox
 %endif
 
 %if %{with kernel}
 install -d $RPM_BUILD_ROOT/etc/rc.d/init.d
-install %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/vboxdrv
-install %{SOURCE5} $RPM_BUILD_ROOT/etc/rc.d/init.d/vboxnetadp
-install %{SOURCE6} $RPM_BUILD_ROOT/etc/rc.d/init.d/vboxnetflt
+install -p %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/vboxdrv
+install -p %{SOURCE5} $RPM_BUILD_ROOT/etc/rc.d/init.d/vboxnetadp
+install -p %{SOURCE6} $RPM_BUILD_ROOT/etc/rc.d/init.d/vboxnetflt
 %install_kernel_modules -m PLD-MODULE-BUILD/vboxhost/vboxdrv/vboxdrv -d misc
 %install_kernel_modules -m PLD-MODULE-BUILD/vboxhost/vboxnetadp/vboxnetadp -d misc
 %install_kernel_modules -m PLD-MODULE-BUILD/vboxhost/vboxnetflt/vboxnetflt -d misc
@@ -421,8 +426,7 @@
 %attr(755,root,root) %{_libdir}/VirtualBox/VBoxOGLhostcrutil.so
 %attr(755,root,root) %{_libdir}/VirtualBox/VBoxOGLhosterrorspu.so
 %attr(755,root,root) %{_libdir}/VirtualBox/VBoxOGLrenderspu.so
-%attr(755,root,root) %{_libdir}/VirtualBox/VBoxPython.so
-%attr(755,root,root) %{_libdir}/VirtualBox/VBoxPython2_7.so
+%attr(755,root,root) %{_libdir}/VirtualBox/VBoxPython*.so
 %attr(755,root,root) %{_libdir}/VirtualBox/VBoxREM.so
 %ifarch %{ix86}
 %attr(755,root,root) %{_libdir}/VirtualBox/VBoxREM32.so
@@ -528,13 +532,15 @@
 /lib/modules/%{_kernel_ver}/misc/vboxnetflt.ko*
 %endif
 
-
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.50  2011/05/14 19:57:37  glen
+- install current python, cosmetics
+
 Revision 1.49  2011/04/25 10:55:23  vip
 - up to 4.0.6
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/VirtualBox-bin/VirtualBox-bin.spec?r1=1.49&r2=1.50&f=u