SPECS (LINUX_2_6_16): VirtualBox.spec - update from LINUX_2_6_22 branch

Fri Oct 31 01:39:17 CET 2008

Author: glen                         Date: Fri Oct 31 00:39:17 2008 GMT
Module: SPECS                         Tag: LINUX_2_6_16
---- Log message:
- update from LINUX_2_6_22 branch

---- Files affected:
SPECS:
   VirtualBox.spec (1.44.2.14 -> 1.44.2.14.2.1) 

---- Diffs:

================================================================
Index: SPECS/VirtualBox.spec
diff -u SPECS/VirtualBox.spec:1.44.2.14 SPECS/VirtualBox.spec:1.44.2.14.2.1

--- SPECS/VirtualBox.spec:1.44.2.14	Tue Jun 10 19:24:07 2008
+++ SPECS/VirtualBox.spec	Fri Oct 31 01:39:12 2008
@@ -14,8 +14,6 @@
 %bcond_without	smp		# without SMP kernel modules
 %bcond_without	userspace	# don't build userspace package
 
-%define         rel             1
-
 %if %{without kernel}
 %undefine	with_dist_kernel
 %endif
@@ -23,9 +21,13 @@
 %if "%{_alt_kernel}" != "%{nil}"
 %undefine	with_userspace
 %endif
+%if %{without userspace}
+# nothing to be placed to debuginfo package
+%define		_enable_debug_packages	0
+%endif
 
+%define		rel		3
 %define		pname	VirtualBox
-
 Summary:	VirtualBox OSE - x86 hardware virtualizer
 Summary(pl.UTF-8):	VirtualBox OSE - wirtualizator sprzętu x86
 Name:		%{pname}%{_alt_kernel}
@@ -33,11 +35,11 @@
 Release:	%{rel}
 License:	GPL v2
 Group:		Applications/Emulators
-Source0:        http://www.virtualbox.org/download/%{version}/%{pname}-%{version}-OSE.tar.bz2
+Source0:	http://www.virtualbox.org/download/%{version}/%{pname}-%{version}-OSE.tar.bz2
 # Source0-md5:  0372a3a31326078f7849a0467d547a70
-Source1:        http://www.virtualbox.org/download/%{version}/UserManual.pdf
+Source1:	http://www.virtualbox.org/download/%{version}/UserManual.pdf
 # Source1-md5:  32505857b575f0fb6f71ba1738c1e102
-Source2:        http://www.virtualbox.org/download/%{version}/VBoxGuestAdditions_%{version}.iso
+Source2:	http://www.virtualbox.org/download/%{version}/VBoxGuestAdditions_%{version}.iso
 # Source2-md5:  3cac7e911e545038102ff641cba66365
 Source3:	%{pname}.init
 Source4:	%{pname}.desktop
@@ -62,14 +64,14 @@
 %if %{with userspace}
 BuildRequires:	libIDL-devel
 BuildRequires:	libuuid-devel
-BuildRequires:	libxslt-progs
 BuildRequires:	libxslt-devel
+BuildRequires:	libxslt-progs
 BuildRequires:	pkgconfig
 BuildRequires:	pulseaudio-devel
 BuildRequires:	qt-devel >= 6:3.3.6
 BuildRequires:	qt-linguist
 %endif
-BuildRequires:	rpmbuild(macros) >= 1.379
+BuildRequires:	rpmbuild(macros) >= 1.452
 %if %{with userspace}
 BuildRequires:	which
 BuildRequires:	xalan-c-devel >= 1.10.0
@@ -143,6 +145,7 @@
 %package udev
 Summary:	udev rules for VirtualBox OSE kernel modules
 Summary(pl.UTF-8):	Reguły udev dla modułów jądra Linuksa dla VirtualBoksa
+Release:	%{rel}
 Group:		Base/Kernel
 Requires:	udev
 
@@ -155,6 +158,7 @@
 %package -n kernel%{_alt_kernel}-misc-vboxadd
 Summary:	Linux kernel module for VirtualBox OSE
 Summary(pl.UTF-8):	Moduł jądra Linuksa dla VirtualBoksa
+Release:	%{rel}@%{_kernel_vermagic}
 Group:		Base/Kernel
 Requires(post,postun):	/sbin/depmod
 Requires:	dev >= 2.9.0-7
@@ -169,6 +173,7 @@
 %package -n kernel%{_alt_kernel}-misc-vboxdrv
 Summary:	Linux kernel module for VirtualBox OSE
 Summary(pl.UTF-8):	Moduł jądra Linuksa dla VirtualBoksa
+Release:	%{rel}@%{_kernel_vermagic}
 Group:		Base/Kernel
 Requires(post,postun):	/sbin/depmod
 Requires:	dev >= 2.9.0-7
@@ -183,6 +188,7 @@
 %package -n kernel%{_alt_kernel}-misc-vboxvfs
 Summary:	Linux kernel module for VirtualBox OSE
 Summary(pl.UTF-8):	Moduł jądra Linuksa dla VirtualBoksa
+Release:	%{rel}@%{_kernel_vermagic}
 Group:		Base/Kernel
 Requires(post,postun):	/sbin/depmod
 Requires:	dev >= 2.9.0-7
@@ -197,6 +203,7 @@
 %package -n kernel%{_alt_kernel}-smp-misc-vboxadd
 Summary:	Linux SMP kernel module for VirtualBox OSE
 Summary(pl.UTF-8):	Moduł jądra Linuksa SMP dla VirtualBoksa
+Release:	%{rel}@%{_kernel_vermagic}
 Group:		Base/Kernel
 Requires(post,postun):	/sbin/depmod
 Requires:	dev >= 2.9.0-7
@@ -211,6 +218,7 @@
 %package -n kernel%{_alt_kernel}-smp-misc-vboxdrv
 Summary:	Linux SMP kernel module for VirtualBox OSE
 Summary(pl.UTF-8):	Moduł jądra Linuksa SMP dla VirtualBoksa
+Release:	%{rel}@%{_kernel_vermagic}
 Group:		Base/Kernel
 Requires(post,postun):	/sbin/depmod
 Requires:	dev >= 2.9.0-7
@@ -225,6 +233,7 @@
 %package -n kernel%{_alt_kernel}-smp-misc-vboxvfs
 Summary:	Linux SMP kernel module for VirtualBox OSE
 Summary(pl.UTF-8):	Moduł jądra Linuksa SMP dla VirtualBoksa
+Release:	%{rel}@%{_kernel_vermagic}
 Group:		Base/Kernel
 Requires(post,postun):	/sbin/depmod
 Requires:	dev >= 2.9.0-7
@@ -239,6 +248,7 @@
 %package -n X11-driver-input-vboxmouse
 Summary:	X.org mouse driver for VirtualBox OSE guest OS
 Summary(pl.UTF-8):	Sterownik myszy dla systemu gościa w VirtualBoksie
+Release:	%{rel}
 Group:		X11/Applications
 Requires:	X11-Xserver >= 1:6.9.0
 
@@ -251,6 +261,7 @@
 %package -n X11-driver-video-vboxvideo
 Summary:	X.org video driver for VirtualBox OSE guest OS
 Summary(pl.UTF-8):	Sterownik grafiki dla systemu gościa w VirtualBoksie
+Release:	%{rel}
 Group:		X11/Applications
 Requires:	X11-Xserver >= 1:6.9.0
 
@@ -294,6 +305,7 @@
 ./configure \
 	--with-gcc="%{__cc}" \
 	--with-g++="%{__cxx}" \
+	--disable-qt4 \
 	--disable-kmods
 
 . ./env.sh && kmk -j1
@@ -520,6 +532,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.44.2.14.2.1  2008/10/31 00:39:12  glen
+- update from LINUX_2_6_22 branch
+
 Revision 1.44.2.14  2008/06/10 17:24:07  marcus
 - up to 1.6.2
 
================================================================

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

