packages: VirtualBox/VirtualBox.spec, VirtualBox/VirtualBox-VBoxSysInfo.pat...

[mguevara]

Author: mguevara                     Date: Sat May 30 22:46:12 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 2.2.4-1
- added patch3 VirtualBox-VBoxSysInfo.patch to recognize PLD Linux

---- Files affected:
packages/VirtualBox:
   VirtualBox.spec (1.204 -> 1.205) , VirtualBox-VBoxSysInfo.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/VirtualBox/VirtualBox.spec
diff -u packages/VirtualBox/VirtualBox.spec:1.204 packages/VirtualBox/VirtualBox.spec:1.205
--- packages/VirtualBox/VirtualBox.spec:1.204	Wed May 27 22:36:04 2009
+++ packages/VirtualBox/VirtualBox.spec	Sun May 31 00:46:07 2009
@@ -24,21 +24,21 @@
 %define		_enable_debug_packages	0
 %endif
 
-%define		rel		2
+%define		rel		1
 %define		pname	VirtualBox
 Summary:	VirtualBox OSE - x86 hardware virtualizer
 Summary(pl.UTF-8):	VirtualBox OSE - wirtualizator sprzętu x86
 Name:		%{pname}%{_alt_kernel}
-Version:	2.2.2
+Version:	2.2.4
 Release:	%{rel}
 License:	GPL v2
 Group:		Applications/Emulators
 Source0:	http://download.virtualbox.org/virtualbox/%{version}/%{pname}-%{version}-OSE.tar.bz2
-# Source0-md5:	82a76247b63e1813695175e7ddf01975
+# Source0-md5:	b90176e3878ccfef2991322b2248dcb0
 Source1:	http://download.virtualbox.org/virtualbox/%{version}/UserManual.pdf
 # Source1-md5:	37573de808ddf2f4e7fe5f46966fbbe6
 Source2:	http://download.virtualbox.org/virtualbox/%{version}/VBoxGuestAdditions_%{version}.iso
-# Source2-md5:	9c09a9e88abe9edd8fec6fd3cf453535
+# Source2-md5:	00e64c25f87155540a3d106c5257530f
 Source3:	%{pname}-vboxdrv.init
 Source4:	%{pname}-vboxadd.init
 Source5:	%{pname}-vboxnetflt.init
@@ -49,6 +49,7 @@
 Patch0:		%{pname}-configure.patch
 Patch1:		%{pname}-configure-spaces.patch
 Patch2:		%{pname}-vboxnetflt_export.patch
+Patch3:		%{pname}-VBoxSysInfo.patch
 URL:		http://www.virtualbox.org/
 BuildRequires:	rpmbuild(macros) >= 1.379
 %if %{with userspace}
@@ -289,6 +290,7 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 cat <<'EOF' > udev.conf
 KERNEL=="vboxdrv", NAME="%k", GROUP="vbox", MODE="0660"
@@ -583,6 +585,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.205  2009/05/30 22:46:07  mguevara
+- up to 2.2.4-1
+- added patch3 VirtualBox-VBoxSysInfo.patch to recognize PLD Linux
+
 Revision 1.204  2009/05/27 20:36:04  mguevara
 - 2.2.2-2; added VBoxSysInfo.sh
 

================================================================
Index: packages/VirtualBox/VirtualBox-VBoxSysInfo.patch
diff -u /dev/null packages/VirtualBox/VirtualBox-VBoxSysInfo.patch:1.1
--- /dev/null	Sun May 31 00:46:12 2009
+++ packages/VirtualBox/VirtualBox-VBoxSysInfo.patch	Sun May 31 00:46:07 2009
@@ -0,0 +1,17 @@
+diff -NurpP --minimal VirtualBox-2.2.2_OSE.orig/src/VBox/Installer/linux/VBoxSysInfo.sh VirtualBox-2.2.2_OSE.new/src/VBox/Installer/linux/VBoxSysInfo.sh
+--- VirtualBox-2.2.2_OSE.orig/src/VBox/Installer/linux/VBoxSysInfo.sh	2009-04-27 19:57:14.000000000 +0200
++++ VirtualBox-2.2.2_OSE.new/src/VBox/Installer/linux/VBoxSysInfo.sh	2009-05-29 18:56:04.000000000 +0200
+@@ -38,7 +38,12 @@ print_linux_info () {
+ # others as unknown.  It can be extended later if other distributions are
+ # found to be "of interest".
+ get_linux_info () {
+-    if [ -r /etc/lsb-release ] && grep Ubuntu /etc/lsb-release >/dev/null 2>&1
++    if [ -r /etc/pld-release ] && grep PLD /etc/pld-release >/dev/null 2>&1
++    then
++	# PLD-based
++	release=`cat /etc/pld-release | sed -e 's/.PLD.*//'`
++	print_linux_info "PLD" $release
++    elif [ -r /etc/lsb-release ] && grep Ubuntu /etc/lsb-release >/dev/null 2>&1
+     then
+         # Ubuntu-based system
+         . /etc/lsb-release
================================================================

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