packages: VirtualBox-bin/VirtualBox-bin.spec - keep sources for both archs ...

pluto pluto at pld-linux.org
Sat Oct 16 10:17:47 CEST 2010


Author: pluto                        Date: Sat Oct 16 08:17:47 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- keep sources for both archs instead of racing in NoSourece-md5 update.

---- Files affected:
packages/VirtualBox-bin:
   VirtualBox-bin.spec (1.44 -> 1.45) 

---- Diffs:

================================================================
Index: packages/VirtualBox-bin/VirtualBox-bin.spec
diff -u packages/VirtualBox-bin/VirtualBox-bin.spec:1.44 packages/VirtualBox-bin/VirtualBox-bin.spec:1.45
--- packages/VirtualBox-bin/VirtualBox-bin.spec:1.44	Wed Oct 13 15:18:23 2010
+++ packages/VirtualBox-bin/VirtualBox-bin.spec	Sat Oct 16 10:17:42 2010
@@ -15,11 +15,6 @@
 # disable debug - no symbols here
 %define		_enable_debug_packages	0
 %define		rel	1
-%ifarch %{x8664}
-%define                arch    amd64
-%else
-%define                arch    x86
-%endif
 
 %define		pname	VirtualBox
 %define		prev	66523
@@ -31,11 +26,14 @@
 Release:	%{rel}
 License:	Free for non-commercial use, non-distributable
 Group:		Applications/Emulators
-Source0:	http://download.virtualbox.org/virtualbox/%{version}/%{pname}-%{version}-%{prev}-Linux_%{arch}.run
-# NoSource0-md5:	a72291e91d521f879338559954ac8b08
+Source0:	http://download.virtualbox.org/virtualbox/%{version}/%{pname}-%{version}-%{prev}-Linux_amd64.run
+# NoSource0-md5:	4f6303fe7680bd70f49bc96a770c2bf4
 NoSource:	0
-Source1:	http://download.virtualbox.org/virtualbox/%{version}/UserManual.pdf
-# Source1-md5:	370bb3e893acffa584536c8f9e966c79
+Source1:	http://download.virtualbox.org/virtualbox/%{version}/%{pname}-%{version}-%{prev}-Linux_x86.run
+# NoSource1-md5:	a72291e91d521f879338559954ac8b08
+NoSource:	1
+Source2:	http://download.virtualbox.org/virtualbox/%{version}/UserManual.pdf
+# Source2-md5:	370bb3e893acffa584536c8f9e966c79
 Source3:	%{pname}-vboxdrv.init
 Source4:	%{pname}-vboxadd.init
 Source5:	%{pname}-vboxnetadp.init
@@ -237,10 +235,15 @@
 
 %prep
 %setup -qcT
+%ifarch %{x8664}
 %{__sh} %{SOURCE0} --noexec --keep
+%else
+%{__sh} %{SOURCE1} --noexec --keep
+%endif
+
 %{__tar} -jxf install/VirtualBox.tar.bz2
 
-install %{SOURCE1} .
+install %{SOURCE2} .
 sed 's#@LIBDIR@#%{_libdir}#' < %{SOURCE9} > VirtualBox-wrapper.sh
 
 rm -rf PLD-MODULE-BUILD && mkdir PLD-MODULE-BUILD && cd PLD-MODULE-BUILD
@@ -539,6 +542,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.45  2010/10/16 08:17:42  pluto
+- keep sources for both archs instead of racing in NoSourece-md5 update.
+
 Revision 1.44  2010/10/13 13:18:23  caleb
 - Finished upgrade to 3.2.10
 
================================================================

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



More information about the pld-cvs-commit mailing list